diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 0278537e15..66cb5bd462 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -220,17 +220,6 @@
     <key>Value</key>
     <integer>1</integer>
   </map>
-  <key>FSMeshUploadPossible</key>
-  <map>
-    <key>Comment</key>
-    <string>If true, shows dummy (preview) avatars in radar.</string>
-    <key>Persist</key>
-    <integer>1</integer>
-    <key>Type</key>
-    <string>Boolean</string>
-    <key>Value</key>
-    <integer>1</integer>
-  </map>
   <key>FSAdvancedTooltips</key>
   <map>
     <key>Comment</key>
@@ -5721,28 +5710,6 @@
       <key>Value</key>
       <integer>0</integer>
     </map>
-    <key>FullScreenAspectRatio</key>
-    <map>
-      <key>Comment</key>
-      <string>Aspect ratio of fullscreen display (width / height)</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>F32</string>
-      <key>Value</key>
-      <real>3</real>
-    </map>
-    <key>FullScreenAutoDetectAspectRatio</key>
-    <map>
-      <key>Comment</key>
-      <string>Automatically detect proper aspect ratio for fullscreen display</string>
-      <key>Persist</key>
-      <integer>1</integer>
-      <key>Type</key>
-      <string>Boolean</string>
-      <key>Value</key>
-      <integer>0</integer>
-    </map>
     <key>GesturesMarketplaceURL</key>
     <map>
       <key>Comment</key>
diff --git a/indra/newview/llfloatermodelpreview.cpp b/indra/newview/llfloatermodelpreview.cpp
index 81fc26e9c3..50587424fc 100644
--- a/indra/newview/llfloatermodelpreview.cpp
+++ b/indra/newview/llfloatermodelpreview.cpp
@@ -646,14 +646,6 @@ void LLFloaterModelPreview::loadModel(S32 lod, const std::string& file_name, boo
 
 void LLFloaterModelPreview::onClickCalculateBtn()
 {
-
-	if(!gSavedSettings.getBOOL("FSMeshUploadPossible")){
-		LLSD args;
-		args["MESSAGE"] = llformat("Mesh upload and calculation is not supported yet." );
-		LLNotificationsUtil::add("GenericAlert", args);
-		return;
-	}
-
 	mModelPreview->rebuildUploadData();
 
 	bool upload_skinweights = childGetValue("upload_skin").asBoolean();
@@ -5731,14 +5723,6 @@ void LLFloaterModelPreview::onReset(void* user_data)
 //static
 void LLFloaterModelPreview::onUpload(void* user_data)
 {
-	if(!gSavedSettings.getBOOL("FSMeshUploadPossible")){
-		LLSD args;
-		args["MESSAGE"] = llformat("Mesh upload and calculation is not supported yet." );
-		LLNotificationsUtil::add("GenericAlert", args);
-		return;
-	}
-
-
 	assert_main_thread();
 
 	LLFloaterModelPreview* mp = (LLFloaterModelPreview*) user_data;