diff --git a/indra/newview/llfloaterimagepreview.cpp b/indra/newview/llfloaterimagepreview.cpp
index b2efabd9d..6db06034f 100644
--- a/indra/newview/llfloaterimagepreview.cpp
+++ b/indra/newview/llfloaterimagepreview.cpp
@@ -97,7 +97,8 @@ BOOL LLFloaterImagePreview::postBuild()
 		return FALSE;
 	}
 
-	childSetLabelArg("ok_btn", "[UPLOADFEE]", gHippoGridManager->getConnectedGrid()->formatFee(LLAgentBenefitsMgr::current().getTextureUploadCost()));
+	auto& grid = *gHippoGridManager->getConnectedGrid();
+	childSetLabelArg("ok_btn", "[UPLOADFEE]", grid.formatFee(LLAgentBenefitsMgr::current().getTextureUploadCost()));
 
 	LLCtrlSelectionInterface* iface = childGetSelectionInterface("clothing_type_combo");
 	if (iface)
@@ -127,7 +128,11 @@ BOOL LLFloaterImagePreview::postBuild()
 
 		// <edit>
 		gSavedSettings.setBOOL("TemporaryUpload",FALSE);
-		childSetValue("temp_check",FALSE);
+		auto child = getChildView("temp_check");
+		if (grid.isSecondLife())
+			child->setVisible(false);
+		else
+			child->setValue(false);
 		// </edit>
 	}
 	else