Index: /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java
===================================================================
--- /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 18993)
+++ /trunk/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java	(revision 18994)
@@ -123,7 +123,6 @@
                 AbstractModifiableLayer odl = (AbstractModifiableLayer) l;
                 if (odl.isModified() &&
-                        (odl.isSavable() || odl.isUploadable() ||
-                                odl.requiresSaveToFile() ||
-                                odl.requiresUploadToServer())) {
+                        (odl.isSavable() && odl.requiresSaveToFile()) ||
+                        (odl.isUploadable() && odl.requiresUploadToServer() && !odl.isUploadDiscouraged())) {
                     layersWithUnsavedChanges.add(odl);
                 }