diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index b88789ada6..b98b6bfb14 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -14514,7 +14514,7 @@ Change of this parameter will affect the layout of buttons in notification toast
     <key>SyncMaterialSettings</key>
     <map>
       <key>Comment</key>
-      <string>SyncMaterialSettings - DO NOT USE AND KEEP IT SET TO 0: Use FSSyncronizeTextureMaps instead!</string>
+      <string>SyncMaterialSettings</string>
       <key>Persist</key>
       <integer>1</integer>
       <key>Type</key>
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 7cda427529..fb55a68f7e 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -168,56 +168,90 @@ BOOL	LLPanelFace::postBuild()
 	childSetAction("pastetextures",&LLPanelFace::onClickPaste,this);
 	
 	mCtrlTexScaleU = getChild<LLSpinCtrl>("TexScaleU");
-	mCtrlTexScaleU->setCommitCallback(&LLPanelFace::onCommitTextureScaleX, this);
-
+	if (mCtrlTexScaleU)
+	{
+		mCtrlTexScaleU->setCommitCallback(&LLPanelFace::onCommitTextureScaleX, this);
+	}
 	mCtrlTexScaleV = getChild<LLSpinCtrl>("TexScaleV");
-	mCtrlTexScaleV->setCommitCallback(&LLPanelFace::onCommitTextureScaleY, this);
-
+	if (mCtrlTexScaleV)
+	{
+		mCtrlTexScaleV->setCommitCallback(&LLPanelFace::onCommitTextureScaleY, this);
+	}
 	mCtrlBumpyScaleU = getChild<LLSpinCtrl>("bumpyScaleU");
-	mCtrlBumpyScaleU->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyScaleX, this);
-
+	if (mCtrlBumpyScaleU)
+	{
+		mCtrlBumpyScaleU->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyScaleX, this);
+	}
 	mCtrlBumpyScaleV = getChild<LLSpinCtrl>("bumpyScaleV");
-	mCtrlBumpyScaleV->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyScaleY, this);
-
+	if (mCtrlBumpyScaleV)
+	{
+		mCtrlBumpyScaleV->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyScaleY, this);
+	}
 	mCtrlShinyScaleU = getChild<LLSpinCtrl>("shinyScaleU");
-	mCtrlShinyScaleU->setCommitCallback(&LLPanelFace::onCommitMaterialShinyScaleX, this);
-
+	if (mCtrlShinyScaleU)
+	{
+		mCtrlShinyScaleU->setCommitCallback(&LLPanelFace::onCommitMaterialShinyScaleX, this);
+	}
 	mCtrlShinyScaleV = getChild<LLSpinCtrl>("shinyScaleV");
-	mCtrlShinyScaleV->setCommitCallback(&LLPanelFace::onCommitMaterialShinyScaleY, this);
-
+	if (mCtrlShinyScaleV)
+	{
+		mCtrlShinyScaleV->setCommitCallback(&LLPanelFace::onCommitMaterialShinyScaleY, this);
+	}	
 	mCtrlTexOffsetU = getChild<LLSpinCtrl>("TexOffsetU");
-	mCtrlTexOffsetU->setCommitCallback(&LLPanelFace::onCommitTextureOffsetX, this);
-
+	if (mCtrlTexOffsetU)
+	{
+		mCtrlTexOffsetU->setCommitCallback(&LLPanelFace::onCommitTextureOffsetX, this);
+	}
 	mCtrlTexOffsetV = getChild<LLSpinCtrl>("TexOffsetV");
-	mCtrlTexOffsetV->setCommitCallback(&LLPanelFace::onCommitTextureOffsetY, this);
-
+	if (mCtrlTexOffsetV)
+	{
+		mCtrlTexOffsetV->setCommitCallback(&LLPanelFace::onCommitTextureOffsetY, this);
+	}
 	mCtrlBumpyOffsetU = getChild<LLSpinCtrl>("bumpyOffsetU");
-	mCtrlBumpyOffsetU->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyOffsetX, this);
-
+	if (mCtrlBumpyOffsetU)
+	{
+		mCtrlBumpyOffsetU->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyOffsetX, this);
+	}
 	mCtrlBumpyOffsetV = getChild<LLSpinCtrl>("bumpyOffsetV");
-	mCtrlBumpyOffsetV->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyOffsetY, this);
-
+	if (mCtrlBumpyOffsetV)
+	{
+		mCtrlBumpyOffsetV->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyOffsetY, this);
+	}
 	mCtrlShinyOffsetU = getChild<LLSpinCtrl>("shinyOffsetU");
-	mCtrlShinyOffsetU->setCommitCallback(&LLPanelFace::onCommitMaterialShinyOffsetX, this);
-
+	if (mCtrlShinyOffsetU)
+	{
+		mCtrlShinyOffsetU->setCommitCallback(&LLPanelFace::onCommitMaterialShinyOffsetX, this);
+	}
 	mCtrlShinyOffsetV = getChild<LLSpinCtrl>("shinyOffsetV");
-	mCtrlShinyOffsetV->setCommitCallback(&LLPanelFace::onCommitMaterialShinyOffsetY, this);
-
+	if (mCtrlShinyOffsetV)
+	{
+		mCtrlShinyOffsetV->setCommitCallback(&LLPanelFace::onCommitMaterialShinyOffsetY, this);
+	}
 	mCtrlTexRot = getChild<LLSpinCtrl>("TexRot");
-	mCtrlTexRot->setCommitCallback(&LLPanelFace::onCommitTextureRot, this);
-
+	if (mCtrlTexRot)
+	{
+		mCtrlTexRot->setCommitCallback(&LLPanelFace::onCommitTextureRot, this);
+	}
 	mCtrlBumpyRot = getChild<LLSpinCtrl>("bumpyRot");
-	mCtrlBumpyRot->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyRot, this);
-
+	if (mCtrlBumpyRot)
+	{
+		mCtrlBumpyRot->setCommitCallback(&LLPanelFace::onCommitMaterialBumpyRot, this);
+	}
 	mCtrlShinyRot = getChild<LLSpinCtrl>("shinyRot");
-	mCtrlShinyRot->setCommitCallback(&LLPanelFace::onCommitMaterialShinyRot, this);
-
+	if (mCtrlShinyRot)
+	{
+		mCtrlShinyRot->setCommitCallback(&LLPanelFace::onCommitMaterialShinyRot, this);
+	}
 	mCtrlRpt = getChild<LLSpinCtrl>("rptctrl");
-	mCtrlRpt->setCommitCallback(LLPanelFace::onCommitRepeatsPerMeter, this);
+	if (mCtrlRpt)
+	{
+		mCtrlRpt->setCommitCallback(LLPanelFace::onCommitRepeatsPerMeter, this);
+	}
 	
 	changePrecision(gSavedSettings.getS32("FSBuildToolDecimalPrecision"));
 	// </FS>
-
+	
+	
 	childSetAction("button align",&LLPanelFace::onClickAutoFix,this);
 
 	// <FS:CR> Moved to the header so other functions can use them too.
@@ -767,10 +801,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 		}
 
 		mRadioMatType->setEnabled(editable);
-		// <FS:Ansariel> Commented out because we already had this
-		//getChildView("checkbox_sync_settings")->setEnabled(editable);
-		//childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
-		// </FS:Ansariel>
+		getChildView("checkbox_sync_settings")->setEnabled(editable);
+		childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
 		updateVisibility();
 
 		bool identical			= true;	// true because it is anded below
diff --git a/indra/newview/skins/default/xui/en/panel_tools_texture.xml b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
index 195765b903..71aba22485 100644
--- a/indra/newview/skins/default/xui/en/panel_tools_texture.xml
+++ b/indra/newview/skins/default/xui/en/panel_tools_texture.xml
@@ -148,7 +148,6 @@
                 top_pad="1"
                 value="2"/>
             </radio_group> 
-            <!-- FS:Ansariel: Commented out because we already had this
             <check_box
              control_name="SyncMaterialSettings"
              follows="top|left"
@@ -161,7 +160,6 @@
              tool_tip="Adjust all maps repeats simultaneously"
              top_pad="-16"
              width="160" />
-            -->
             <texture_picker
              can_apply_immediately="true"
              default_image_name="Default"