diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index 27507cea64..2a2512254f 100755
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -123,12 +123,13 @@ BOOL LLFloaterImagePreview::postBuild()
 			getChildView("lossless_check")->setEnabled(TRUE);
 		
 // <FS:CR> Temporary texture uploads
-		if (LLGlobalEconomy::Singleton::getInstance()->getPriceUpload() == 0
-			|| gAgent.getRegion()->getCentralBakeVersion() > 0)
+		BOOL enable_temp_uploads = (LLGlobalEconomy::Singleton::getInstance()->getPriceUpload() != 0
+									&& gAgent.getRegion()->getCentralBakeVersion() == 0);
+		if (!enable_temp_uploads)
 		{
 			gSavedSettings.setBOOL("TemporaryUpload", FALSE);
-			getChild<LLCheckBoxCtrl>("temp_check")->setVisible(FALSE);
 		}
+		getChild<LLCheckBoxCtrl>("temp_check")->setVisible(enable_temp_uploads);
 // </FS:CR>
 	}
 	else
diff --git a/indra/newview/skins/default/xui/en/floater_image_preview.xml b/indra/newview/skins/default/xui/en/floater_image_preview.xml
index 960aa7c676..981581c438 100755
--- a/indra/newview/skins/default/xui/en/floater_image_preview.xml
+++ b/indra/newview/skins/default/xui/en/floater_image_preview.xml
@@ -132,6 +132,7 @@ Try saving image as 24 bit Targa (.tga).
      width="280" />
      <check_box
       control_name="TemporaryUpload"
+      visible="false"
       follows="bottom|left"
       height="16"
       initial_value="false"