Index: trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java
===================================================================
--- trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 18692)
+++ trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java	(revision 18693)
@@ -1088,5 +1088,5 @@
     public void onPostLoadFromFile() {
         setRequiresSaveToFile(false);
-        setRequiresUploadToServer(isModified());
+        setRequiresUploadToServer(getDataSet().requiresUploadToServer());
         invalidate();
     }
@@ -1097,5 +1097,5 @@
     public void onPostDownloadFromServer() {
         setRequiresSaveToFile(true);
-        setRequiresUploadToServer(isModified());
+        setRequiresUploadToServer(getDataSet().requiresUploadToServer());
         invalidate();
     }
@@ -1104,10 +1104,10 @@
     public void onPostSaveToFile() {
         setRequiresSaveToFile(false);
-        setRequiresUploadToServer(isModified());
+        setRequiresUploadToServer(getDataSet().requiresUploadToServer());
     }
 
     @Override
     public void onPostUploadToServer() {
-        setRequiresUploadToServer(isModified());
+        setRequiresUploadToServer(getDataSet().requiresUploadToServer());
         // keep requiresSaveToDisk unchanged
     }