Merge branch 'main' into marchcat/x-b-merge

# Conflicts:
#	autobuild.xml
#	indra/cmake/ConfigurePkgConfig.cmake
#	indra/cmake/ICU4C.cmake
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamer_syms.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamertriviallogging.h
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.cpp
#	indra/media_plugins/gstreamer010/llmediaimplgstreamervidplug.h
#	indra/media_plugins/gstreamer010/media_plugin_gstreamer010.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llfloateremojipicker.cpp
#	indra/newview/lloutfitslist.cpp

1 files changed, 1966 insertions, 1966 deletions

diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index a72d7f2773..5adc9b971a 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -1,25 +1,25 @@
-/** 
+/**
  * @file llpanelface.cpp
  * @brief Panel in the tools floater for editing face textures, colors, etc.
  *
  * $LicenseInfo:firstyear=2001&license=viewerlgpl$
  * Second Life Viewer Source Code
  * Copyright (C) 2010, Linden Research, Inc.
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation;
  * version 2.1 of the License only.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- * 
+ *
  * Linden Research, Inc., 945 Battery Street, San Francisco, CA  94111  USA
  * $/LicenseInfo$
  */
@@ -28,7 +28,7 @@
 
 // file include
 #include "llpanelface.h"
- 
+
 // library includes
 #include "llcalc.h"
 #include "llerror.h"
@@ -102,15 +102,15 @@ LLPanelFace::Selection LLPanelFace::sMaterialOverrideSelection;
 // Constant definitions for comboboxes
 // Must match the commbobox definitions in panel_tools_texture.xml
 //
-const S32 MATMEDIA_MATERIAL = 0;	// Material
-const S32 MATMEDIA_PBR = 1;			// PBR
-const S32 MATMEDIA_MEDIA = 2;		// Media
-const S32 MATTYPE_DIFFUSE = 0;		// Diffuse material texture
-const S32 MATTYPE_NORMAL = 1;		// Normal map
-const S32 MATTYPE_SPECULAR = 2;		// Specular map
-const S32 ALPHAMODE_MASK = 2;		// Alpha masking mode
-const S32 BUMPY_TEXTURE = 18;		// use supplied normal map
-const S32 SHINY_TEXTURE = 4;		// use supplied specular map
+const S32 MATMEDIA_MATERIAL = 0;    // Material
+const S32 MATMEDIA_PBR = 1;         // PBR
+const S32 MATMEDIA_MEDIA = 2;       // Media
+const S32 MATTYPE_DIFFUSE = 0;      // Diffuse material texture
+const S32 MATTYPE_NORMAL = 1;       // Normal map
+const S32 MATTYPE_SPECULAR = 2;     // Specular map
+const S32 ALPHAMODE_MASK = 2;       // Alpha masking mode
+const S32 BUMPY_TEXTURE = 18;       // use supplied normal map
+const S32 SHINY_TEXTURE = 4;        // use supplied specular map
 const S32 PBRTYPE_RENDER_MATERIAL_ID = 0;  // Render Material ID
 const S32 PBRTYPE_BASE_COLOR = 1;   // PBR Base Color
 const S32 PBRTYPE_METALLIC_ROUGHNESS = 2; // PBR Metallic
@@ -159,7 +159,7 @@ void LLPanelFace::updateSelectedGLTFMaterials(std::function<void(LLGLTFMaterial*
             return true;
         }
 
-		std::function<void(LLGLTFMaterial*)> mFunc;
+        std::function<void(LLGLTFMaterial*)> mFunc;
     } select_func(func);
 
     LLSelectMgr::getInstance()->getSelection()->applyToTEs(&select_func);
@@ -176,7 +176,7 @@ void readSelectedGLTFMaterial(std::function<T(const LLGLTFMaterial*)> func, T& v
         {
             const LLTextureEntry* tep = object->getTE(face);
             const LLGLTFMaterial* render_material = tep->getGLTFRenderMaterial();
-            
+
             return mFunc(render_material);
         }
 
@@ -211,9 +211,9 @@ LLRender::eTexIndex LLPanelFace::getTextureChannelToEdit()
         }
     }
 
-	channel_to_edit = (channel_to_edit == LLRender::NORMAL_MAP)		? (getCurrentNormalMap().isNull()		? LLRender::DIFFUSE_MAP : channel_to_edit) : channel_to_edit;
-	channel_to_edit = (channel_to_edit == LLRender::SPECULAR_MAP)	? (getCurrentSpecularMap().isNull()		? LLRender::DIFFUSE_MAP : channel_to_edit) : channel_to_edit;
-	return channel_to_edit;
+    channel_to_edit = (channel_to_edit == LLRender::NORMAL_MAP)     ? (getCurrentNormalMap().isNull()       ? LLRender::DIFFUSE_MAP : channel_to_edit) : channel_to_edit;
+    channel_to_edit = (channel_to_edit == LLRender::SPECULAR_MAP)   ? (getCurrentSpecularMap().isNull()     ? LLRender::DIFFUSE_MAP : channel_to_edit) : channel_to_edit;
+    return channel_to_edit;
 }
 
 LLRender::eTexIndex LLPanelFace::getTextureDropChannel()
@@ -240,55 +240,55 @@ LLGLTFMaterial::TextureInfo LLPanelFace::getPBRDropChannel()
 
 // Things the UI provides...
 //
-LLUUID	LLPanelFace::getCurrentNormalMap()			{ return getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();	}
-LLUUID	LLPanelFace::getCurrentSpecularMap()		{ return getChild<LLTextureCtrl>("shinytexture control")->getImageAssetID();	}
-U32		LLPanelFace::getCurrentShininess()			{ return getChild<LLComboBox>("combobox shininess")->getCurrentIndex();			}
-U32		LLPanelFace::getCurrentBumpiness()			{ return getChild<LLComboBox>("combobox bumpiness")->getCurrentIndex();			}
-U8			LLPanelFace::getCurrentDiffuseAlphaMode()	{ return (U8)getChild<LLComboBox>("combobox alphamode")->getCurrentIndex();	}
-U8			LLPanelFace::getCurrentAlphaMaskCutoff()	{ return (U8)getChild<LLUICtrl>("maskcutoff")->getValue().asInteger();			}
-U8			LLPanelFace::getCurrentEnvIntensity()		{ return (U8)getChild<LLUICtrl>("environment")->getValue().asInteger();			}
-U8			LLPanelFace::getCurrentGlossiness()			{ return (U8)getChild<LLUICtrl>("glossiness")->getValue().asInteger();			}
-F32		LLPanelFace::getCurrentBumpyRot()			{ return getChild<LLUICtrl>("bumpyRot")->getValue().asReal();						}
-F32		LLPanelFace::getCurrentBumpyScaleU()		{ return getChild<LLUICtrl>("bumpyScaleU")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentBumpyScaleV()		{ return getChild<LLUICtrl>("bumpyScaleV")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentBumpyOffsetU()		{ return getChild<LLUICtrl>("bumpyOffsetU")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentBumpyOffsetV()		{ return getChild<LLUICtrl>("bumpyOffsetV")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentShinyRot()			{ return getChild<LLUICtrl>("shinyRot")->getValue().asReal();						}
-F32		LLPanelFace::getCurrentShinyScaleU()		{ return getChild<LLUICtrl>("shinyScaleU")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentShinyScaleV()		{ return getChild<LLUICtrl>("shinyScaleV")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentShinyOffsetU()		{ return getChild<LLUICtrl>("shinyOffsetU")->getValue().asReal();					}
-F32		LLPanelFace::getCurrentShinyOffsetV()		{ return getChild<LLUICtrl>("shinyOffsetV")->getValue().asReal();					}
+LLUUID  LLPanelFace::getCurrentNormalMap()          { return getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();    }
+LLUUID  LLPanelFace::getCurrentSpecularMap()        { return getChild<LLTextureCtrl>("shinytexture control")->getImageAssetID();    }
+U32     LLPanelFace::getCurrentShininess()          { return getChild<LLComboBox>("combobox shininess")->getCurrentIndex();         }
+U32     LLPanelFace::getCurrentBumpiness()          { return getChild<LLComboBox>("combobox bumpiness")->getCurrentIndex();         }
+U8          LLPanelFace::getCurrentDiffuseAlphaMode()   { return (U8)getChild<LLComboBox>("combobox alphamode")->getCurrentIndex(); }
+U8          LLPanelFace::getCurrentAlphaMaskCutoff()    { return (U8)getChild<LLUICtrl>("maskcutoff")->getValue().asInteger();          }
+U8          LLPanelFace::getCurrentEnvIntensity()       { return (U8)getChild<LLUICtrl>("environment")->getValue().asInteger();         }
+U8          LLPanelFace::getCurrentGlossiness()         { return (U8)getChild<LLUICtrl>("glossiness")->getValue().asInteger();          }
+F32     LLPanelFace::getCurrentBumpyRot()           { return getChild<LLUICtrl>("bumpyRot")->getValue().asReal();                       }
+F32     LLPanelFace::getCurrentBumpyScaleU()        { return getChild<LLUICtrl>("bumpyScaleU")->getValue().asReal();                    }
+F32     LLPanelFace::getCurrentBumpyScaleV()        { return getChild<LLUICtrl>("bumpyScaleV")->getValue().asReal();                    }
+F32     LLPanelFace::getCurrentBumpyOffsetU()       { return getChild<LLUICtrl>("bumpyOffsetU")->getValue().asReal();                   }
+F32     LLPanelFace::getCurrentBumpyOffsetV()       { return getChild<LLUICtrl>("bumpyOffsetV")->getValue().asReal();                   }
+F32     LLPanelFace::getCurrentShinyRot()           { return getChild<LLUICtrl>("shinyRot")->getValue().asReal();                       }
+F32     LLPanelFace::getCurrentShinyScaleU()        { return getChild<LLUICtrl>("shinyScaleU")->getValue().asReal();                    }
+F32     LLPanelFace::getCurrentShinyScaleV()        { return getChild<LLUICtrl>("shinyScaleV")->getValue().asReal();                    }
+F32     LLPanelFace::getCurrentShinyOffsetU()       { return getChild<LLUICtrl>("shinyOffsetU")->getValue().asReal();                   }
+F32     LLPanelFace::getCurrentShinyOffsetV()       { return getChild<LLUICtrl>("shinyOffsetV")->getValue().asReal();                   }
 
 //
 // Methods
 //
 
-BOOL	LLPanelFace::postBuild()
-{
-	childSetCommitCallback("combobox shininess",&LLPanelFace::onCommitShiny,this);
-	childSetCommitCallback("combobox bumpiness",&LLPanelFace::onCommitBump,this);
-	childSetCommitCallback("combobox alphamode",&LLPanelFace::onCommitAlphaMode,this);
-	childSetCommitCallback("TexScaleU",&LLPanelFace::onCommitTextureScaleX, this);
-	childSetCommitCallback("TexScaleV",&LLPanelFace::onCommitTextureScaleY, this);
-	childSetCommitCallback("TexRot",&LLPanelFace::onCommitTextureRot, this);
-	childSetCommitCallback("rptctrl",&LLPanelFace::onCommitRepeatsPerMeter, this);
-	childSetCommitCallback("checkbox planar align",&LLPanelFace::onCommitPlanarAlign, this);
-	childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureOffsetX, this);
-	childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureOffsetY, this);
-
-	childSetCommitCallback("bumpyScaleU",&LLPanelFace::onCommitMaterialBumpyScaleX, this);
-	childSetCommitCallback("bumpyScaleV",&LLPanelFace::onCommitMaterialBumpyScaleY, this);
-	childSetCommitCallback("bumpyRot",&LLPanelFace::onCommitMaterialBumpyRot, this);
-	childSetCommitCallback("bumpyOffsetU",&LLPanelFace::onCommitMaterialBumpyOffsetX, this);
-	childSetCommitCallback("bumpyOffsetV",&LLPanelFace::onCommitMaterialBumpyOffsetY, this);
-	childSetCommitCallback("shinyScaleU",&LLPanelFace::onCommitMaterialShinyScaleX, this);
-	childSetCommitCallback("shinyScaleV",&LLPanelFace::onCommitMaterialShinyScaleY, this);
-	childSetCommitCallback("shinyRot",&LLPanelFace::onCommitMaterialShinyRot, this);
-	childSetCommitCallback("shinyOffsetU",&LLPanelFace::onCommitMaterialShinyOffsetX, this);
-	childSetCommitCallback("shinyOffsetV",&LLPanelFace::onCommitMaterialShinyOffsetY, this);
-	childSetCommitCallback("glossiness",&LLPanelFace::onCommitMaterialGloss, this);
-	childSetCommitCallback("environment",&LLPanelFace::onCommitMaterialEnv, this);
-	childSetCommitCallback("maskcutoff",&LLPanelFace::onCommitMaterialMaskCutoff, this);
+BOOL    LLPanelFace::postBuild()
+{
+    childSetCommitCallback("combobox shininess",&LLPanelFace::onCommitShiny,this);
+    childSetCommitCallback("combobox bumpiness",&LLPanelFace::onCommitBump,this);
+    childSetCommitCallback("combobox alphamode",&LLPanelFace::onCommitAlphaMode,this);
+    childSetCommitCallback("TexScaleU",&LLPanelFace::onCommitTextureScaleX, this);
+    childSetCommitCallback("TexScaleV",&LLPanelFace::onCommitTextureScaleY, this);
+    childSetCommitCallback("TexRot",&LLPanelFace::onCommitTextureRot, this);
+    childSetCommitCallback("rptctrl",&LLPanelFace::onCommitRepeatsPerMeter, this);
+    childSetCommitCallback("checkbox planar align",&LLPanelFace::onCommitPlanarAlign, this);
+    childSetCommitCallback("TexOffsetU",LLPanelFace::onCommitTextureOffsetX, this);
+    childSetCommitCallback("TexOffsetV",LLPanelFace::onCommitTextureOffsetY, this);
+
+    childSetCommitCallback("bumpyScaleU",&LLPanelFace::onCommitMaterialBumpyScaleX, this);
+    childSetCommitCallback("bumpyScaleV",&LLPanelFace::onCommitMaterialBumpyScaleY, this);
+    childSetCommitCallback("bumpyRot",&LLPanelFace::onCommitMaterialBumpyRot, this);
+    childSetCommitCallback("bumpyOffsetU",&LLPanelFace::onCommitMaterialBumpyOffsetX, this);
+    childSetCommitCallback("bumpyOffsetV",&LLPanelFace::onCommitMaterialBumpyOffsetY, this);
+    childSetCommitCallback("shinyScaleU",&LLPanelFace::onCommitMaterialShinyScaleX, this);
+    childSetCommitCallback("shinyScaleV",&LLPanelFace::onCommitMaterialShinyScaleY, this);
+    childSetCommitCallback("shinyRot",&LLPanelFace::onCommitMaterialShinyRot, this);
+    childSetCommitCallback("shinyOffsetU",&LLPanelFace::onCommitMaterialShinyOffsetX, this);
+    childSetCommitCallback("shinyOffsetV",&LLPanelFace::onCommitMaterialShinyOffsetY, this);
+    childSetCommitCallback("glossiness",&LLPanelFace::onCommitMaterialGloss, this);
+    childSetCommitCallback("environment",&LLPanelFace::onCommitMaterialEnv, this);
+    childSetCommitCallback("maskcutoff",&LLPanelFace::onCommitMaterialMaskCutoff, this);
     childSetCommitCallback("add_media", &LLPanelFace::onClickBtnAddMedia, this);
     childSetCommitCallback("delete_media", &LLPanelFace::onClickBtnDeleteMedia, this);
 
@@ -301,30 +301,30 @@ BOOL	LLPanelFace::postBuild()
     LLGLTFMaterialList::addSelectionUpdateCallback(&LLPanelFace::onMaterialOverrideReceived);
     sMaterialOverrideSelection.connect();
 
-	childSetAction("button align",&LLPanelFace::onClickAutoFix,this);
-	childSetAction("button align textures", &LLPanelFace::onAlignTexture, this);
+    childSetAction("button align",&LLPanelFace::onClickAutoFix,this);
+    childSetAction("button align textures", &LLPanelFace::onAlignTexture, this);
     childSetAction("pbr_from_inventory", &LLPanelFace::onClickBtnLoadInvPBR, this);
     childSetAction("edit_selected_pbr", &LLPanelFace::onClickBtnEditPBR, this);
     childSetAction("save_selected_pbr", &LLPanelFace::onClickBtnSavePBR, this);
 
-	LLTextureCtrl*	mTextureCtrl;
-	LLTextureCtrl*	mShinyTextureCtrl;
-	LLTextureCtrl*	mBumpyTextureCtrl;
-	LLColorSwatchCtrl*	mColorSwatch;
-	LLColorSwatchCtrl*	mShinyColorSwatch;
+    LLTextureCtrl*  mTextureCtrl;
+    LLTextureCtrl*  mShinyTextureCtrl;
+    LLTextureCtrl*  mBumpyTextureCtrl;
+    LLColorSwatchCtrl*  mColorSwatch;
+    LLColorSwatchCtrl*  mShinyColorSwatch;
 
-	LLComboBox*		mComboTexGen;
+    LLComboBox*     mComboTexGen;
 
-	LLCheckBoxCtrl	*mCheckFullbright;
-	
-	LLTextBox*		mLabelColorTransp;
-	LLSpinCtrl*		mCtrlColorTransp;		// transparency = 1 - alpha
+    LLCheckBoxCtrl  *mCheckFullbright;
 
-	LLSpinCtrl*     mCtrlGlow;
+    LLTextBox*      mLabelColorTransp;
+    LLSpinCtrl*     mCtrlColorTransp;       // transparency = 1 - alpha
 
-	setMouseOpaque(FALSE);
+    LLSpinCtrl*     mCtrlGlow;
 
-    LLTextureCtrl*	pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
+    setMouseOpaque(FALSE);
+
+    LLTextureCtrl*  pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
     if (pbr_ctrl)
     {
         pbr_ctrl->setDefaultImageAssetID(LLUUID::null);
@@ -344,117 +344,117 @@ BOOL	LLPanelFace::postBuild()
         pbr_ctrl->setInventoryPickType(PICK_MATERIAL);
     }
 
-	mTextureCtrl = getChild<LLTextureCtrl>("texture control");
-	if(mTextureCtrl)
-	{
-		mTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_TEXTURE);
-		mTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitTexture, this, _2) );
-		mTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelTexture, this, _2) );
-		mTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectTexture, this, _2) );
-		mTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
-		mTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
-		mTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
-
-		mTextureCtrl->setFollowsTop();
-		mTextureCtrl->setFollowsLeft();
-		mTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
-		mTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
-	}
-
-	mShinyTextureCtrl = getChild<LLTextureCtrl>("shinytexture control");
-	if(mShinyTextureCtrl)
-	{
-		mShinyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_SPECULAR);
-		mShinyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitSpecularTexture, this, _2) );
-		mShinyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelSpecularTexture, this, _2) );
-		mShinyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectSpecularTexture, this, _2) );
-		mShinyTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
-		
-		mShinyTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
-		mShinyTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
-		mShinyTextureCtrl->setFollowsTop();
-		mShinyTextureCtrl->setFollowsLeft();
-		mShinyTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
-		mShinyTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
-	}
-
-	mBumpyTextureCtrl = getChild<LLTextureCtrl>("bumpytexture control");
-	if(mBumpyTextureCtrl)
-	{
-		mBumpyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_NORMAL);
-		mBumpyTextureCtrl->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
-		mBumpyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitNormalTexture, this, _2) );
-		mBumpyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelNormalTexture, this, _2) );
-		mBumpyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectNormalTexture, this, _2) );
-		mBumpyTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
-
-		mBumpyTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
-		mBumpyTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
-		mBumpyTextureCtrl->setFollowsTop();
-		mBumpyTextureCtrl->setFollowsLeft();
-		mBumpyTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
-		mBumpyTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
-	}
-
-	mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
-	if(mColorSwatch)
-	{
-		mColorSwatch->setCommitCallback(boost::bind(&LLPanelFace::onCommitColor, this, _2));
-		mColorSwatch->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelColor, this, _2));
-		mColorSwatch->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectColor, this, _2));
-		mColorSwatch->setFollowsTop();
-		mColorSwatch->setFollowsLeft();
-		mColorSwatch->setCanApplyImmediately(TRUE);
-	}
-
-	mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
-	if(mShinyColorSwatch)
-	{
-		mShinyColorSwatch->setCommitCallback(boost::bind(&LLPanelFace::onCommitShinyColor, this, _2));
-		mShinyColorSwatch->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelShinyColor, this, _2));
-		mShinyColorSwatch->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectShinyColor, this, _2));
-		mShinyColorSwatch->setFollowsTop();
-		mShinyColorSwatch->setFollowsLeft();
-		mShinyColorSwatch->setCanApplyImmediately(TRUE);
-	}
-
-	mLabelColorTransp = getChild<LLTextBox>("color trans");
-	if(mLabelColorTransp)
-	{
-		mLabelColorTransp->setFollowsTop();
-		mLabelColorTransp->setFollowsLeft();
-	}
-
-	mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
-	if(mCtrlColorTransp)
-	{
-		mCtrlColorTransp->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlpha, this, _2));
-		mCtrlColorTransp->setPrecision(0);
-		mCtrlColorTransp->setFollowsTop();
-		mCtrlColorTransp->setFollowsLeft();
-	}
-
-	mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
-	if (mCheckFullbright)
-	{
-		mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright, this);
-	}
-
-	mComboTexGen = getChild<LLComboBox>("combobox texgen");
-	if(mComboTexGen)
-	{
-		mComboTexGen->setCommitCallback(LLPanelFace::onCommitTexGen, this);
-		mComboTexGen->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);	
-	}
+    mTextureCtrl = getChild<LLTextureCtrl>("texture control");
+    if(mTextureCtrl)
+    {
+        mTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_TEXTURE);
+        mTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitTexture, this, _2) );
+        mTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelTexture, this, _2) );
+        mTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectTexture, this, _2) );
+        mTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
+        mTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
+        mTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
+
+        mTextureCtrl->setFollowsTop();
+        mTextureCtrl->setFollowsLeft();
+        mTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
+        mTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
+    }
+
+    mShinyTextureCtrl = getChild<LLTextureCtrl>("shinytexture control");
+    if(mShinyTextureCtrl)
+    {
+        mShinyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_SPECULAR);
+        mShinyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitSpecularTexture, this, _2) );
+        mShinyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelSpecularTexture, this, _2) );
+        mShinyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectSpecularTexture, this, _2) );
+        mShinyTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
+
+        mShinyTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
+        mShinyTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
+        mShinyTextureCtrl->setFollowsTop();
+        mShinyTextureCtrl->setFollowsLeft();
+        mShinyTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
+        mShinyTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
+    }
+
+    mBumpyTextureCtrl = getChild<LLTextureCtrl>("bumpytexture control");
+    if(mBumpyTextureCtrl)
+    {
+        mBumpyTextureCtrl->setDefaultImageAssetID(DEFAULT_OBJECT_NORMAL);
+        mBumpyTextureCtrl->setBlankImageAssetID(BLANK_OBJECT_NORMAL);
+        mBumpyTextureCtrl->setCommitCallback( boost::bind(&LLPanelFace::onCommitNormalTexture, this, _2) );
+        mBumpyTextureCtrl->setOnCancelCallback( boost::bind(&LLPanelFace::onCancelNormalTexture, this, _2) );
+        mBumpyTextureCtrl->setOnSelectCallback( boost::bind(&LLPanelFace::onSelectNormalTexture, this, _2) );
+        mBumpyTextureCtrl->setOnCloseCallback( boost::bind(&LLPanelFace::onCloseTexturePicker, this, _2) );
+
+        mBumpyTextureCtrl->setDragCallback(boost::bind(&LLPanelFace::onDragTexture, this, _2));
+        mBumpyTextureCtrl->setOnTextureSelectedCallback(boost::bind(&LLPanelFace::onTextureSelectionChanged, this, _1));
+        mBumpyTextureCtrl->setFollowsTop();
+        mBumpyTextureCtrl->setFollowsLeft();
+        mBumpyTextureCtrl->setImmediateFilterPermMask(PERM_NONE);
+        mBumpyTextureCtrl->setDnDFilterPermMask(PERM_COPY | PERM_TRANSFER);
+    }
+
+    mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
+    if(mColorSwatch)
+    {
+        mColorSwatch->setCommitCallback(boost::bind(&LLPanelFace::onCommitColor, this, _2));
+        mColorSwatch->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelColor, this, _2));
+        mColorSwatch->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectColor, this, _2));
+        mColorSwatch->setFollowsTop();
+        mColorSwatch->setFollowsLeft();
+        mColorSwatch->setCanApplyImmediately(TRUE);
+    }
+
+    mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
+    if(mShinyColorSwatch)
+    {
+        mShinyColorSwatch->setCommitCallback(boost::bind(&LLPanelFace::onCommitShinyColor, this, _2));
+        mShinyColorSwatch->setOnCancelCallback(boost::bind(&LLPanelFace::onCancelShinyColor, this, _2));
+        mShinyColorSwatch->setOnSelectCallback(boost::bind(&LLPanelFace::onSelectShinyColor, this, _2));
+        mShinyColorSwatch->setFollowsTop();
+        mShinyColorSwatch->setFollowsLeft();
+        mShinyColorSwatch->setCanApplyImmediately(TRUE);
+    }
+
+    mLabelColorTransp = getChild<LLTextBox>("color trans");
+    if(mLabelColorTransp)
+    {
+        mLabelColorTransp->setFollowsTop();
+        mLabelColorTransp->setFollowsLeft();
+    }
+
+    mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
+    if(mCtrlColorTransp)
+    {
+        mCtrlColorTransp->setCommitCallback(boost::bind(&LLPanelFace::onCommitAlpha, this, _2));
+        mCtrlColorTransp->setPrecision(0);
+        mCtrlColorTransp->setFollowsTop();
+        mCtrlColorTransp->setFollowsLeft();
+    }
+
+    mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
+    if (mCheckFullbright)
+    {
+        mCheckFullbright->setCommitCallback(LLPanelFace::onCommitFullbright, this);
+    }
+
+    mComboTexGen = getChild<LLComboBox>("combobox texgen");
+    if(mComboTexGen)
+    {
+        mComboTexGen->setCommitCallback(LLPanelFace::onCommitTexGen, this);
+        mComboTexGen->setFollows(FOLLOWS_LEFT | FOLLOWS_TOP);
+    }
 
     mComboMatMedia = getChild<LLComboBox>("combobox matmedia");
-	if(mComboMatMedia)
-	{
+    if(mComboMatMedia)
+    {
         mComboMatMedia->setCommitCallback(LLPanelFace::onCommitMaterialsMedia,this);
         mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
-	}
+    }
 
-	LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
+    LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
     if(radio_mat_type)
     {
         radio_mat_type->setCommitCallback(LLPanelFace::onCommitMaterialType, this);
@@ -468,25 +468,25 @@ BOOL	LLPanelFace::postBuild()
         radio_pbr_type->selectNthItem(PBRTYPE_RENDER_MATERIAL_ID);
     }
 
-	mCtrlGlow = getChild<LLSpinCtrl>("glow");
-	if(mCtrlGlow)
-	{
-		mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow, this);
-	}
+    mCtrlGlow = getChild<LLSpinCtrl>("glow");
+    if(mCtrlGlow)
+    {
+        mCtrlGlow->setCommitCallback(LLPanelFace::onCommitGlow, this);
+    }
 
     mMenuClipboardColor = getChild<LLMenuButton>("clipboard_color_params_btn");
     mMenuClipboardTexture = getChild<LLMenuButton>("clipboard_texture_params_btn");
-    
+
     mTitleMedia = getChild<LLMediaCtrl>("title_media");
     mTitleMediaText = getChild<LLTextBox>("media_info");
 
-	clearCtrls();
+    clearCtrls();
 
-	return TRUE;
+    return TRUE;
 }
 
 LLPanelFace::LLPanelFace()
-:	LLPanel(),
+:   LLPanel(),
     mIsAlpha(false),
     mComboMatMedia(NULL),
     mTitleMedia(NULL),
@@ -532,131 +532,131 @@ void LLPanelFace::draw()
 
 void LLPanelFace::sendTexture()
 {
-	LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("texture control");
-	if(!mTextureCtrl) return;
-	if( !mTextureCtrl->getTentative() )
-	{
-		// we grab the item id first, because we want to do a
-		// permissions check in the selection manager. ARGH!
-		LLUUID id = mTextureCtrl->getImageItemID();
-		if(id.isNull())
-		{
-			id = mTextureCtrl->getImageAssetID();
-		}
+    LLTextureCtrl* mTextureCtrl = getChild<LLTextureCtrl>("texture control");
+    if(!mTextureCtrl) return;
+    if( !mTextureCtrl->getTentative() )
+    {
+        // we grab the item id first, because we want to do a
+        // permissions check in the selection manager. ARGH!
+        LLUUID id = mTextureCtrl->getImageItemID();
+        if(id.isNull())
+        {
+            id = mTextureCtrl->getImageAssetID();
+        }
         if (!LLSelectMgr::getInstance()->selectionSetImage(id))
         {
             // need to refresh value in texture ctrl
             refresh();
         }
-	}
+    }
 }
 
 void LLPanelFace::sendBump(U32 bumpiness)
-{	
-	LLTextureCtrl* bumpytexture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
-	if (bumpiness < BUMPY_TEXTURE)
-{	
-		LL_DEBUGS("Materials") << "clearing bumptexture control" << LL_ENDL;	
-		bumpytexture_ctrl->clear();
-		bumpytexture_ctrl->setImageAssetID(LLUUID());		
-	}
+{
+    LLTextureCtrl* bumpytexture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
+    if (bumpiness < BUMPY_TEXTURE)
+{
+        LL_DEBUGS("Materials") << "clearing bumptexture control" << LL_ENDL;
+        bumpytexture_ctrl->clear();
+        bumpytexture_ctrl->setImageAssetID(LLUUID());
+    }
 
-	updateBumpyControls(bumpiness == BUMPY_TEXTURE, true);
+    updateBumpyControls(bumpiness == BUMPY_TEXTURE, true);
 
-	LLUUID current_normal_map = bumpytexture_ctrl->getImageAssetID();
+    LLUUID current_normal_map = bumpytexture_ctrl->getImageAssetID();
 
-	U8 bump = (U8) bumpiness & TEM_BUMP_MASK;
+    U8 bump = (U8) bumpiness & TEM_BUMP_MASK;
 
-	// Clear legacy bump to None when using an actual normal map
-	//
-	if (!current_normal_map.isNull())
-		bump = 0;
+    // Clear legacy bump to None when using an actual normal map
+    //
+    if (!current_normal_map.isNull())
+        bump = 0;
 
-	// Set the normal map or reset it to null as appropriate
-	//
-	LLSelectedTEMaterial::setNormalID(this, current_normal_map);
+    // Set the normal map or reset it to null as appropriate
+    //
+    LLSelectedTEMaterial::setNormalID(this, current_normal_map);
 
-	LLSelectMgr::getInstance()->selectionSetBumpmap( bump, bumpytexture_ctrl->getImageItemID() );
+    LLSelectMgr::getInstance()->selectionSetBumpmap( bump, bumpytexture_ctrl->getImageItemID() );
 }
 
 void LLPanelFace::sendTexGen()
 {
-	LLComboBox*	mComboTexGen = getChild<LLComboBox>("combobox texgen");
-	if(!mComboTexGen)return;
-	U8 tex_gen = (U8) mComboTexGen->getCurrentIndex() << TEM_TEX_GEN_SHIFT;
-	LLSelectMgr::getInstance()->selectionSetTexGen( tex_gen );
+    LLComboBox* mComboTexGen = getChild<LLComboBox>("combobox texgen");
+    if(!mComboTexGen)return;
+    U8 tex_gen = (U8) mComboTexGen->getCurrentIndex() << TEM_TEX_GEN_SHIFT;
+    LLSelectMgr::getInstance()->selectionSetTexGen( tex_gen );
 }
 
 void LLPanelFace::sendShiny(U32 shininess)
 {
-	LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
+    LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
 
-	if (shininess < SHINY_TEXTURE)
+    if (shininess < SHINY_TEXTURE)
 {
-		texture_ctrl->clear();
-		texture_ctrl->setImageAssetID(LLUUID());		
-	}
+        texture_ctrl->clear();
+        texture_ctrl->setImageAssetID(LLUUID());
+    }
+
+    LLUUID specmap = getCurrentSpecularMap();
 
-	LLUUID specmap = getCurrentSpecularMap();
+    U8 shiny = (U8) shininess & TEM_SHINY_MASK;
+    if (!specmap.isNull())
+        shiny = 0;
 
-	U8 shiny = (U8) shininess & TEM_SHINY_MASK;
-	if (!specmap.isNull())
-		shiny = 0;
+    LLSelectedTEMaterial::setSpecularID(this, specmap);
 
-	LLSelectedTEMaterial::setSpecularID(this, specmap);
+    LLSelectMgr::getInstance()->selectionSetShiny( shiny, texture_ctrl->getImageItemID() );
 
-	LLSelectMgr::getInstance()->selectionSetShiny( shiny, texture_ctrl->getImageItemID() );
+    updateShinyControls(!specmap.isNull(), true);
 
-	updateShinyControls(!specmap.isNull(), true);
-	
 }
 
 void LLPanelFace::sendFullbright()
 {
-	LLCheckBoxCtrl*	mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
-	if(!mCheckFullbright)return;
-	U8 fullbright = mCheckFullbright->get() ? TEM_FULLBRIGHT_MASK : 0;
-	LLSelectMgr::getInstance()->selectionSetFullbright( fullbright );
+    LLCheckBoxCtrl* mCheckFullbright = getChild<LLCheckBoxCtrl>("checkbox fullbright");
+    if(!mCheckFullbright)return;
+    U8 fullbright = mCheckFullbright->get() ? TEM_FULLBRIGHT_MASK : 0;
+    LLSelectMgr::getInstance()->selectionSetFullbright( fullbright );
 }
 
 void LLPanelFace::sendColor()
 {
-	
-	LLColorSwatchCtrl*	mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
-	if(!mColorSwatch)return;
-	LLColor4 color = mColorSwatch->get();
 
-	LLSelectMgr::getInstance()->selectionSetColorOnly( color );
+    LLColorSwatchCtrl*  mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
+    if(!mColorSwatch)return;
+    LLColor4 color = mColorSwatch->get();
+
+    LLSelectMgr::getInstance()->selectionSetColorOnly( color );
 }
 
 void LLPanelFace::sendAlpha()
-{	
-	LLSpinCtrl*	mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
-	if(!mCtrlColorTransp)return;
-	F32 alpha = (100.f - mCtrlColorTransp->get()) / 100.f;
+{
+    LLSpinCtrl* mCtrlColorTransp = getChild<LLSpinCtrl>("ColorTrans");
+    if(!mCtrlColorTransp)return;
+    F32 alpha = (100.f - mCtrlColorTransp->get()) / 100.f;
 
-	LLSelectMgr::getInstance()->selectionSetAlphaOnly( alpha );
+    LLSelectMgr::getInstance()->selectionSetAlphaOnly( alpha );
 }
 
 
 void LLPanelFace::sendGlow()
 {
-	LLSpinCtrl* mCtrlGlow = getChild<LLSpinCtrl>("glow");
-	llassert(mCtrlGlow);
-	if (mCtrlGlow)
-	{
-		F32 glow = mCtrlGlow->get();
-		LLSelectMgr::getInstance()->selectionSetGlow( glow );
-	}
+    LLSpinCtrl* mCtrlGlow = getChild<LLSpinCtrl>("glow");
+    llassert(mCtrlGlow);
+    if (mCtrlGlow)
+    {
+        F32 glow = mCtrlGlow->get();
+        LLSelectMgr::getInstance()->selectionSetGlow( glow );
+    }
 }
 
 struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
 {
-	LLPanelFaceSetTEFunctor(LLPanelFace* panel) : mPanel(panel) {}
-	virtual bool apply(LLViewerObject* object, S32 te)
-	{
-		BOOL valid;
-		F32 value;
+    LLPanelFaceSetTEFunctor(LLPanelFace* panel) : mPanel(panel) {}
+    virtual bool apply(LLViewerObject* object, S32 te)
+    {
+        BOOL valid;
+        F32 value;
         std::string prefix;
 
         // Effectively the same as MATMEDIA_PBR sans using different radio,
@@ -674,179 +674,179 @@ struct LLPanelFaceSetTEFunctor : public LLSelectedTEFunctor
             prefix = "shiny";
             break;
         }
-        
+
         LLSpinCtrl * ctrlTexScaleS = mPanel->getChild<LLSpinCtrl>(prefix + "ScaleU");
         LLSpinCtrl * ctrlTexScaleT = mPanel->getChild<LLSpinCtrl>(prefix + "ScaleV");
         LLSpinCtrl * ctrlTexOffsetS = mPanel->getChild<LLSpinCtrl>(prefix + "OffsetU");
         LLSpinCtrl * ctrlTexOffsetT = mPanel->getChild<LLSpinCtrl>(prefix + "OffsetV");
         LLSpinCtrl * ctrlTexRotation = mPanel->getChild<LLSpinCtrl>(prefix + "Rot");
 
-		LLComboBox*	comboTexGen = mPanel->getChild<LLComboBox>("combobox texgen");
-		LLCheckBoxCtrl*	cb_planar_align = mPanel->getChild<LLCheckBoxCtrl>("checkbox planar align");
-		bool align_planar = (cb_planar_align && cb_planar_align->get());
-
-		llassert(comboTexGen);
-		llassert(object);
-
-		if (ctrlTexScaleS)
-		{
-			valid = !ctrlTexScaleS->getTentative(); // || !checkFlipScaleS->getTentative();
-			if (valid || align_planar)
-			{
-				value = ctrlTexScaleS->get();
-				if (comboTexGen &&
-				    comboTexGen->getCurrentIndex() == 1)
-				{
-					value *= 0.5f;
-				}
-				object->setTEScaleS( te, value );
-
-				if (align_planar) 
-				{
-					LLPanelFace::LLSelectedTEMaterial::setNormalRepeatX(mPanel, value, te, object->getID());
-					LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatX(mPanel, value, te, object->getID());
-				}
-			}
-		}
-
-		if (ctrlTexScaleT)
-		{
-			valid = !ctrlTexScaleT->getTentative(); // || !checkFlipScaleT->getTentative();
-			if (valid || align_planar)
-			{
-				value = ctrlTexScaleT->get();
-				//if( checkFlipScaleT->get() )
-				//{
-				//	value = -value;
-				//}
-				if (comboTexGen &&
-				    comboTexGen->getCurrentIndex() == 1)
-				{
-					value *= 0.5f;
-				}
-				object->setTEScaleT( te, value );
-
-				if (align_planar) 
-				{
-					LLPanelFace::LLSelectedTEMaterial::setNormalRepeatY(mPanel, value, te, object->getID());
-					LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatY(mPanel, value, te, object->getID());
-				}
-			}
-		}
-
-		if (ctrlTexOffsetS)
-		{
-			valid = !ctrlTexOffsetS->getTentative();
-			if (valid || align_planar)
-			{
-				value = ctrlTexOffsetS->get();
-				object->setTEOffsetS( te, value );
-
-				if (align_planar) 
-				{
-					LLPanelFace::LLSelectedTEMaterial::setNormalOffsetX(mPanel, value, te, object->getID());
-					LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetX(mPanel, value, te, object->getID());
-				}
-			}
-		}
-
-		if (ctrlTexOffsetT)
-		{
-			valid = !ctrlTexOffsetT->getTentative();
-			if (valid || align_planar)
-			{
-				value = ctrlTexOffsetT->get();
-				object->setTEOffsetT( te, value );
-
-				if (align_planar) 
-				{
-					LLPanelFace::LLSelectedTEMaterial::setNormalOffsetY(mPanel, value, te, object->getID());
-					LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetY(mPanel, value, te, object->getID());
-				}
-			}
-		}
-
-		if (ctrlTexRotation)
-		{
-			valid = !ctrlTexRotation->getTentative();
-			if (valid || align_planar)
-			{
-				value = ctrlTexRotation->get() * DEG_TO_RAD;
-				object->setTERotation( te, value );
-
-				if (align_planar) 
-				{
-					LLPanelFace::LLSelectedTEMaterial::setNormalRotation(mPanel, value, te, object->getID());
-					LLPanelFace::LLSelectedTEMaterial::setSpecularRotation(mPanel, value, te, object->getID());
-				}
-			}
-		}
-		return true;
-	}
+        LLComboBox* comboTexGen = mPanel->getChild<LLComboBox>("combobox texgen");
+        LLCheckBoxCtrl* cb_planar_align = mPanel->getChild<LLCheckBoxCtrl>("checkbox planar align");
+        bool align_planar = (cb_planar_align && cb_planar_align->get());
+
+        llassert(comboTexGen);
+        llassert(object);
+
+        if (ctrlTexScaleS)
+        {
+            valid = !ctrlTexScaleS->getTentative(); // || !checkFlipScaleS->getTentative();
+            if (valid || align_planar)
+            {
+                value = ctrlTexScaleS->get();
+                if (comboTexGen &&
+                    comboTexGen->getCurrentIndex() == 1)
+                {
+                    value *= 0.5f;
+                }
+                object->setTEScaleS( te, value );
+
+                if (align_planar)
+                {
+                    LLPanelFace::LLSelectedTEMaterial::setNormalRepeatX(mPanel, value, te, object->getID());
+                    LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatX(mPanel, value, te, object->getID());
+                }
+            }
+        }
+
+        if (ctrlTexScaleT)
+        {
+            valid = !ctrlTexScaleT->getTentative(); // || !checkFlipScaleT->getTentative();
+            if (valid || align_planar)
+            {
+                value = ctrlTexScaleT->get();
+                //if( checkFlipScaleT->get() )
+                //{
+                //  value = -value;
+                //}
+                if (comboTexGen &&
+                    comboTexGen->getCurrentIndex() == 1)
+                {
+                    value *= 0.5f;
+                }
+                object->setTEScaleT( te, value );
+
+                if (align_planar)
+                {
+                    LLPanelFace::LLSelectedTEMaterial::setNormalRepeatY(mPanel, value, te, object->getID());
+                    LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatY(mPanel, value, te, object->getID());
+                }
+            }
+        }
+
+        if (ctrlTexOffsetS)
+        {
+            valid = !ctrlTexOffsetS->getTentative();
+            if (valid || align_planar)
+            {
+                value = ctrlTexOffsetS->get();
+                object->setTEOffsetS( te, value );
+
+                if (align_planar)
+                {
+                    LLPanelFace::LLSelectedTEMaterial::setNormalOffsetX(mPanel, value, te, object->getID());
+                    LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetX(mPanel, value, te, object->getID());
+                }
+            }
+        }
+
+        if (ctrlTexOffsetT)
+        {
+            valid = !ctrlTexOffsetT->getTentative();
+            if (valid || align_planar)
+            {
+                value = ctrlTexOffsetT->get();
+                object->setTEOffsetT( te, value );
+
+                if (align_planar)
+                {
+                    LLPanelFace::LLSelectedTEMaterial::setNormalOffsetY(mPanel, value, te, object->getID());
+                    LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetY(mPanel, value, te, object->getID());
+                }
+            }
+        }
+
+        if (ctrlTexRotation)
+        {
+            valid = !ctrlTexRotation->getTentative();
+            if (valid || align_planar)
+            {
+                value = ctrlTexRotation->get() * DEG_TO_RAD;
+                object->setTERotation( te, value );
+
+                if (align_planar)
+                {
+                    LLPanelFace::LLSelectedTEMaterial::setNormalRotation(mPanel, value, te, object->getID());
+                    LLPanelFace::LLSelectedTEMaterial::setSpecularRotation(mPanel, value, te, object->getID());
+                }
+            }
+        }
+        return true;
+    }
 private:
-	LLPanelFace* mPanel;
+    LLPanelFace* mPanel;
 };
 
 // Functor that aligns a face to mCenterFace
 struct LLPanelFaceSetAlignedTEFunctor : public LLSelectedTEFunctor
 {
-	LLPanelFaceSetAlignedTEFunctor(LLPanelFace* panel, LLFace* center_face) :
-		mPanel(panel),
-		mCenterFace(center_face) {}
-
-	virtual bool apply(LLViewerObject* object, S32 te)
-	{
-		LLFace* facep = object->mDrawable->getFace(te);
-		if (!facep)
-		{
-			return true;
-		}
-
-		if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te)
-		{
-			return true;
-		}
-
-		bool set_aligned = true;
-		if (facep == mCenterFace)
-		{
-			set_aligned = false;
-		}
-		if (set_aligned)
-		{
-			LLVector2 uv_offset, uv_scale;
-			F32 uv_rot;
-			set_aligned = facep->calcAlignedPlanarTE(mCenterFace, &uv_offset, &uv_scale, &uv_rot);
-			if (set_aligned)
-			{
-				object->setTEOffset(te, uv_offset.mV[VX], uv_offset.mV[VY]);
-				object->setTEScale(te, uv_scale.mV[VX], uv_scale.mV[VY]);
-				object->setTERotation(te, uv_rot);
-
-				LLPanelFace::LLSelectedTEMaterial::setNormalRotation(mPanel, uv_rot, te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setSpecularRotation(mPanel, uv_rot, te, object->getID());
-
-				LLPanelFace::LLSelectedTEMaterial::setNormalOffsetX(mPanel, uv_offset.mV[VX], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setNormalOffsetY(mPanel, uv_offset.mV[VY], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setNormalRepeatX(mPanel, uv_scale.mV[VX], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setNormalRepeatY(mPanel, uv_scale.mV[VY], te, object->getID());
-
-				LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetX(mPanel, uv_offset.mV[VX], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetY(mPanel, uv_offset.mV[VY], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatX(mPanel, uv_scale.mV[VX], te, object->getID());
-				LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatY(mPanel, uv_scale.mV[VY], te, object->getID());
-			}
-		}
-		if (!set_aligned)
-		{
-			LLPanelFaceSetTEFunctor setfunc(mPanel);
-			setfunc.apply(object, te);
-		}
-		return true;
-	}
+    LLPanelFaceSetAlignedTEFunctor(LLPanelFace* panel, LLFace* center_face) :
+        mPanel(panel),
+        mCenterFace(center_face) {}
+
+    virtual bool apply(LLViewerObject* object, S32 te)
+    {
+        LLFace* facep = object->mDrawable->getFace(te);
+        if (!facep)
+        {
+            return true;
+        }
+
+        if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te)
+        {
+            return true;
+        }
+
+        bool set_aligned = true;
+        if (facep == mCenterFace)
+        {
+            set_aligned = false;
+        }
+        if (set_aligned)
+        {
+            LLVector2 uv_offset, uv_scale;
+            F32 uv_rot;
+            set_aligned = facep->calcAlignedPlanarTE(mCenterFace, &uv_offset, &uv_scale, &uv_rot);
+            if (set_aligned)
+            {
+                object->setTEOffset(te, uv_offset.mV[VX], uv_offset.mV[VY]);
+                object->setTEScale(te, uv_scale.mV[VX], uv_scale.mV[VY]);
+                object->setTERotation(te, uv_rot);
+
+                LLPanelFace::LLSelectedTEMaterial::setNormalRotation(mPanel, uv_rot, te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setSpecularRotation(mPanel, uv_rot, te, object->getID());
+
+                LLPanelFace::LLSelectedTEMaterial::setNormalOffsetX(mPanel, uv_offset.mV[VX], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setNormalOffsetY(mPanel, uv_offset.mV[VY], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setNormalRepeatX(mPanel, uv_scale.mV[VX], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setNormalRepeatY(mPanel, uv_scale.mV[VY], te, object->getID());
+
+                LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetX(mPanel, uv_offset.mV[VX], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setSpecularOffsetY(mPanel, uv_offset.mV[VY], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatX(mPanel, uv_scale.mV[VX], te, object->getID());
+                LLPanelFace::LLSelectedTEMaterial::setSpecularRepeatY(mPanel, uv_scale.mV[VY], te, object->getID());
+            }
+        }
+        if (!set_aligned)
+        {
+            LLPanelFaceSetTEFunctor setfunc(mPanel);
+            setfunc.apply(object, te);
+        }
+        return true;
+    }
 private:
-	LLPanelFace* mPanel;
-	LLFace* mCenterFace;
+    LLPanelFace* mPanel;
+    LLFace* mCenterFace;
 };
 
 struct LLPanelFaceSetAlignedConcreteTEFunctor : public LLSelectedTEFunctor
@@ -902,7 +902,7 @@ struct LLPanelFaceSetAlignedConcreteTEFunctor : public LLSelectedTEFunctor
                 }
             }
         }
-        
+
         return true;
     }
 private:
@@ -914,36 +914,36 @@ private:
 // Functor that tests if a face is aligned to mCenterFace
 struct LLPanelFaceGetIsAlignedTEFunctor : public LLSelectedTEFunctor
 {
-	LLPanelFaceGetIsAlignedTEFunctor(LLFace* center_face) :
-		mCenterFace(center_face) {}
-
-	virtual bool apply(LLViewerObject* object, S32 te)
-	{
-		LLFace* facep = object->mDrawable->getFace(te);
-		if (!facep)
-		{
-			return false;
-		}
-
-		if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te)
-		{ //volume face does not exist, can't be aligned
-			return false;
-		}
-
-		if (facep == mCenterFace)
-		{
-			return true;
-		}
-		
-		LLVector2 aligned_st_offset, aligned_st_scale;
-		F32 aligned_st_rot;
-		if ( facep->calcAlignedPlanarTE(mCenterFace, &aligned_st_offset, &aligned_st_scale, &aligned_st_rot) )
-		{
-			const LLTextureEntry* tep = facep->getTextureEntry();
-			LLVector2 st_offset, st_scale;
-			tep->getOffset(&st_offset.mV[VX], &st_offset.mV[VY]);
-			tep->getScale(&st_scale.mV[VX], &st_scale.mV[VY]);
-			F32 st_rot = tep->getRotation();
+    LLPanelFaceGetIsAlignedTEFunctor(LLFace* center_face) :
+        mCenterFace(center_face) {}
+
+    virtual bool apply(LLViewerObject* object, S32 te)
+    {
+        LLFace* facep = object->mDrawable->getFace(te);
+        if (!facep)
+        {
+            return false;
+        }
+
+        if (facep->getViewerObject()->getVolume()->getNumVolumeFaces() <= te)
+        { //volume face does not exist, can't be aligned
+            return false;
+        }
+
+        if (facep == mCenterFace)
+        {
+            return true;
+        }
+
+        LLVector2 aligned_st_offset, aligned_st_scale;
+        F32 aligned_st_rot;
+        if ( facep->calcAlignedPlanarTE(mCenterFace, &aligned_st_offset, &aligned_st_scale, &aligned_st_rot) )
+        {
+            const LLTextureEntry* tep = facep->getTextureEntry();
+            LLVector2 st_offset, st_scale;
+            tep->getOffset(&st_offset.mV[VX], &st_offset.mV[VY]);
+            tep->getScale(&st_scale.mV[VX], &st_scale.mV[VY]);
+            F32 st_rot = tep->getRotation();
 
             bool eq_offset_x = is_approx_equal_fraction(st_offset.mV[VX], aligned_st_offset.mV[VX], 12);
             bool eq_offset_y = is_approx_equal_fraction(st_offset.mV[VY], aligned_st_offset.mV[VY], 12);
@@ -951,49 +951,49 @@ struct LLPanelFaceGetIsAlignedTEFunctor : public LLSelectedTEFunctor
             bool eq_scale_y  = is_approx_equal_fraction(st_scale.mV[VY], aligned_st_scale.mV[VY], 12);
             bool eq_rot      = is_approx_equal_fraction(st_rot, aligned_st_rot, 6);
 
-			// needs a fuzzy comparison, because of fp errors
-			if (eq_offset_x && 
-				eq_offset_y && 
-				eq_scale_x &&
-				eq_scale_y &&
-				eq_rot)
-			{
-				return true;
-			}
-		}
-		return false;
-	}
+            // needs a fuzzy comparison, because of fp errors
+            if (eq_offset_x &&
+                eq_offset_y &&
+                eq_scale_x &&
+                eq_scale_y &&
+                eq_rot)
+            {
+                return true;
+            }
+        }
+        return false;
+    }
 private:
-	LLFace* mCenterFace;
+    LLFace* mCenterFace;
 };
 
 struct LLPanelFaceSendFunctor : public LLSelectedObjectFunctor
 {
-	virtual bool apply(LLViewerObject* object)
-	{
-		object->sendTEUpdate();
-		return true;
-	}
+    virtual bool apply(LLViewerObject* object)
+    {
+        object->sendTEUpdate();
+        return true;
+    }
 };
 
 void LLPanelFace::sendTextureInfo()
 {
-	if ((bool)childGetValue("checkbox planar align").asBoolean())
-	{
-		LLFace* last_face = NULL;
-		bool identical_face =false;
-		LLSelectedTE::getFace(last_face, identical_face);		
-		LLPanelFaceSetAlignedTEFunctor setfunc(this, last_face);
-		LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
-	}
-	else
-	{
-		LLPanelFaceSetTEFunctor setfunc(this);
-		LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
-	}
+    if ((bool)childGetValue("checkbox planar align").asBoolean())
+    {
+        LLFace* last_face = NULL;
+        bool identical_face =false;
+        LLSelectedTE::getFace(last_face, identical_face);
+        LLPanelFaceSetAlignedTEFunctor setfunc(this, last_face);
+        LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
+    }
+    else
+    {
+        LLPanelFaceSetTEFunctor setfunc(this);
+        LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
+    }
 
-	LLPanelFaceSendFunctor sendfunc;
-	LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
+    LLPanelFaceSendFunctor sendfunc;
+    LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
 
 void LLPanelFace::alignTestureLayer()
@@ -1009,19 +1009,19 @@ void LLPanelFace::alignTestureLayer()
 
 void LLPanelFace::getState()
 {
-	updateUI();
+    updateUI();
 }
 
 void LLPanelFace::updateUI(bool force_set_values /*false*/)
 { //set state of UI to match state of texture entry(ies)  (calls setEnabled, setValue, etc, but NOT setVisible)
     LLSelectNode* node = LLSelectMgr::getInstance()->getSelection()->getFirstNode();
-	LLViewerObject* objectp = node ? node->getObject() : NULL;
+    LLViewerObject* objectp = node ? node->getObject() : NULL;
 
-	if (objectp
-		&& objectp->getPCode() == LL_PCODE_VOLUME
-		&& objectp->permModify())
-	{
-		BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
+    if (objectp
+        && objectp->getPCode() == LL_PCODE_VOLUME
+        && objectp->permModify())
+    {
+        BOOL editable = objectp->permModify() && !objectp->isPermanentEnforced();
         BOOL attachment = objectp->isAttachment();
 
         bool has_pbr_material;
@@ -1030,9 +1030,9 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
         const bool has_material = !has_pbr_material;
 
-		// only turn on auto-adjust button if there is a media renderer and the media is loaded
+        // only turn on auto-adjust button if there is a media renderer and the media is loaded
         childSetEnabled("button align", editable);
-		
+
         if (mComboMatMedia->getCurrentIndex() < MATMEDIA_MATERIAL)
         {
             // When selecting an object with a pbr and UI combo is not set,
@@ -1069,8 +1069,8 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
 
         static S32 selected_te = -1;
         static LLUUID prev_obj_id;
-        if ((LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool()) && 
-            !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected()) 
+        if ((LLToolFace::getInstance() == LLToolMgr::getInstance()->getCurrentTool()) &&
+            !LLSelectMgr::getInstance()->getSelection()->isMultipleTESelected())
         {
             S32 new_selection = -1; // Don't use getLastSelectedTE, it could have been deselected
             S32 num_tes = llmin((S32)objectp->getNumTEs(), (S32)objectp->getNumFaces());
@@ -1093,11 +1093,11 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 {
                     mComboMatMedia->selectNthItem(MATMEDIA_PBR);
                 }
-                else if (te_has_media) 
+                else if (te_has_media)
                 {
                     mComboMatMedia->selectNthItem(MATMEDIA_MEDIA);
                 }
-                else if (id.notNull() || normmap_id.notNull() || specmap_id.notNull()) 
+                else if (id.notNull() || normmap_id.notNull() || specmap_id.notNull())
                 {
                     mComboMatMedia->selectNthItem(MATMEDIA_MATERIAL);
                 }
@@ -1105,11 +1105,11 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 prev_obj_id = objectp->getID();
             }
         }
-        else 
+        else
         {
             if (prev_obj_id != objectp->getID())
             {
-                if (has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_MATERIAL)) 
+                if (has_pbr_material && (mComboMatMedia->getCurrentIndex() == MATMEDIA_MATERIAL))
                 {
                     mComboMatMedia->selectNthItem(MATMEDIA_PBR);
                 }
@@ -1138,24 +1138,24 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
         const bool pbr_selected = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR;
         const bool texture_info_selected = pbr_selected && radio_pbr_type->getSelectedIndex() != PBRTYPE_RENDER_MATERIAL_ID;
 
-		getChildView("checkbox_sync_settings")->setEnabled(editable);
-		childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
+        getChildView("checkbox_sync_settings")->setEnabled(editable);
+        childSetValue("checkbox_sync_settings", gSavedSettings.getBOOL("SyncMaterialSettings"));
 
-		updateVisibility(objectp);
+        updateVisibility(objectp);
 
-		// Color swatch
-		{
-			getChildView("color label")->setEnabled(editable);
-		}
-		LLColorSwatchCtrl* color_swatch = findChild<LLColorSwatchCtrl>("colorswatch");
+        // Color swatch
+        {
+            getChildView("color label")->setEnabled(editable);
+        }
+        LLColorSwatchCtrl* color_swatch = findChild<LLColorSwatchCtrl>("colorswatch");
 
-		LLColor4 color = LLColor4::white;
-		bool identical_color = false;
+        LLColor4 color = LLColor4::white;
+        bool identical_color = false;
 
-		if (color_swatch)
-		{
-			LLSelectedTE::getColor(color, identical_color);
-			LLColor4 prev_color = color_swatch->get();
+        if (color_swatch)
+        {
+            LLSelectedTE::getColor(color, identical_color);
+            LLColor4 prev_color = color_swatch->get();
 
             color_swatch->setOriginal(color);
             color_swatch->set(color, force_set_values || (prev_color != color) || !editable);
@@ -1163,179 +1163,179 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
             color_swatch->setValid(editable && !has_pbr_material);
             color_swatch->setEnabled( editable && !has_pbr_material);
             color_swatch->setCanApplyImmediately( editable && !has_pbr_material);
-		}
-
-		// Color transparency
-		getChildView("color trans")->setEnabled(editable);
-
-		F32 transparency = (1.f - color.mV[VALPHA]) * 100.f;
-		getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0);
-		getChildView("ColorTrans")->setEnabled(editable && has_material);
-
-		U8 shiny = 0;
-		bool identical_shiny = false;
-
-		// Shiny
-		LLSelectedTE::getShiny(shiny, identical_shiny);
-		identical = identical && identical_shiny;
-
-		shiny = specmap_id.isNull() ? shiny : SHINY_TEXTURE;
-
-		LLCtrlSelectionInterface* combobox_shininess = childGetSelectionInterface("combobox shininess");
-		if (combobox_shininess)
-		{
-			combobox_shininess->selectNthItem((S32)shiny);
-		}
-
-		getChildView("label shininess")->setEnabled(editable);
-		getChildView("combobox shininess")->setEnabled(editable);
-
-		getChildView("label glossiness")->setEnabled(editable);			
-		getChildView("glossiness")->setEnabled(editable);
-
-		getChildView("label environment")->setEnabled(editable);
-		getChildView("environment")->setEnabled(editable);
-		getChildView("label shinycolor")->setEnabled(editable);
-					
-		getChild<LLUICtrl>("combobox shininess")->setTentative(!identical_spec);
-		getChild<LLUICtrl>("glossiness")->setTentative(!identical_spec);
-		getChild<LLUICtrl>("environment")->setTentative(!identical_spec);			
-		getChild<LLUICtrl>("shinycolorswatch")->setTentative(!identical_spec);
-					
-		LLColorSwatchCtrl*	mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
-		if (mShinyColorSwatch)
-		{
-			mShinyColorSwatch->setValid(editable);
-			mShinyColorSwatch->setEnabled( editable );
-			mShinyColorSwatch->setCanApplyImmediately( editable );
-		}
-
-		U8 bumpy = 0;
-		// Bumpy
-		{
-			bool identical_bumpy = false;
-			LLSelectedTE::getBumpmap(bumpy,identical_bumpy);
-
-			LLUUID norm_map_id = getCurrentNormalMap();
-			LLCtrlSelectionInterface* combobox_bumpiness = childGetSelectionInterface("combobox bumpiness");
-
-			bumpy = norm_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
-
-			if (combobox_bumpiness)
-			{
-				combobox_bumpiness->selectNthItem((S32)bumpy);
-			}
-			else
-			{
-				LL_WARNS() << "failed childGetSelectionInterface for 'combobox bumpiness'" << LL_ENDL;
-			}
-
-			getChildView("combobox bumpiness")->setEnabled(editable);
-			getChild<LLUICtrl>("combobox bumpiness")->setTentative(!identical_bumpy);
-			getChildView("label bumpiness")->setEnabled(editable);
-		}
-
-		// Texture
-		{
-			mIsAlpha = FALSE;
-			LLGLenum image_format = GL_RGB;
-			bool identical_image_format = false;
-			LLSelectedTE::getImageFormat(image_format, identical_image_format);
-            
-			mIsAlpha = FALSE;
-			switch (image_format)
-			{
-				case GL_RGBA:
-				case GL_ALPHA:
-				{
-					mIsAlpha = TRUE;
-				}
-				break;
-
-				case GL_RGB: break;
-				default:
-				{
-					LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
-				}
-				break;
-			}
-
-			if (LLViewerMedia::getInstance()->textureHasMedia(id))
-			{
-				getChildView("button align")->setEnabled(editable);
-			}
-			
-			// Diffuse Alpha Mode
-
-			// Init to the default that is appropriate for the alpha content of the asset
-			//
-			U8 alpha_mode = mIsAlpha ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-
-			bool identical_alpha_mode = false;
-
-			// See if that's been overridden by a material setting for same...
-			//
-			LLSelectedTEMaterial::getCurrentDiffuseAlphaMode(alpha_mode, identical_alpha_mode, mIsAlpha);
-
-			LLCtrlSelectionInterface* combobox_alphamode = childGetSelectionInterface("combobox alphamode");
-			if (combobox_alphamode)
-			{
-				//it is invalid to have any alpha mode other than blend if transparency is greater than zero ... 
-				// Want masking? Want emissive? Tough! You get BLEND!
-				alpha_mode = (transparency > 0.f) ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : alpha_mode;
-
-				// ... unless there is no alpha channel in the texture, in which case alpha mode MUST be none
-				alpha_mode = mIsAlpha ? alpha_mode : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-
-				combobox_alphamode->selectNthItem(alpha_mode);
-			}
-			else
-			{
-				LL_WARNS() << "failed childGetSelectionInterface for 'combobox alphamode'" << LL_ENDL;
-			}
-
-			updateAlphaControls();
-
-			if (texture_ctrl)
-			{
-				if (identical_diffuse)
-				{
-					texture_ctrl->setTentative(FALSE);
-					texture_ctrl->setEnabled(editable && !has_pbr_material);
-					texture_ctrl->setImageAssetID(id);
-					getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
-					getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-					getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-					getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-
-					texture_ctrl->setBakeTextureEnabled(TRUE);
-				}
-				else if (id.isNull())
-				{
-					// None selected
-					texture_ctrl->setTentative(FALSE);
-					texture_ctrl->setEnabled(FALSE);
-					texture_ctrl->setImageAssetID(LLUUID::null);
-					getChildView("combobox alphamode")->setEnabled(FALSE);
-					getChildView("label alphamode")->setEnabled(FALSE);
-					getChildView("maskcutoff")->setEnabled(FALSE);
-					getChildView("label maskcutoff")->setEnabled(FALSE);
-
-					texture_ctrl->setBakeTextureEnabled(false);
-				}
-				else
-				{
-					// Tentative: multiple selected with different textures
-					texture_ctrl->setTentative(TRUE);
-					texture_ctrl->setEnabled(editable && !has_pbr_material);
-					texture_ctrl->setImageAssetID(id);
-					getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
-					getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-					getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-					getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
-					
-					texture_ctrl->setBakeTextureEnabled(TRUE);
-				}
+        }
+
+        // Color transparency
+        getChildView("color trans")->setEnabled(editable);
+
+        F32 transparency = (1.f - color.mV[VALPHA]) * 100.f;
+        getChild<LLUICtrl>("ColorTrans")->setValue(editable ? transparency : 0);
+        getChildView("ColorTrans")->setEnabled(editable && has_material);
+
+        U8 shiny = 0;
+        bool identical_shiny = false;
+
+        // Shiny
+        LLSelectedTE::getShiny(shiny, identical_shiny);
+        identical = identical && identical_shiny;
+
+        shiny = specmap_id.isNull() ? shiny : SHINY_TEXTURE;
+
+        LLCtrlSelectionInterface* combobox_shininess = childGetSelectionInterface("combobox shininess");
+        if (combobox_shininess)
+        {
+            combobox_shininess->selectNthItem((S32)shiny);
+        }
+
+        getChildView("label shininess")->setEnabled(editable);
+        getChildView("combobox shininess")->setEnabled(editable);
+
+        getChildView("label glossiness")->setEnabled(editable);
+        getChildView("glossiness")->setEnabled(editable);
+
+        getChildView("label environment")->setEnabled(editable);
+        getChildView("environment")->setEnabled(editable);
+        getChildView("label shinycolor")->setEnabled(editable);
+
+        getChild<LLUICtrl>("combobox shininess")->setTentative(!identical_spec);
+        getChild<LLUICtrl>("glossiness")->setTentative(!identical_spec);
+        getChild<LLUICtrl>("environment")->setTentative(!identical_spec);
+        getChild<LLUICtrl>("shinycolorswatch")->setTentative(!identical_spec);
+
+        LLColorSwatchCtrl*  mShinyColorSwatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
+        if (mShinyColorSwatch)
+        {
+            mShinyColorSwatch->setValid(editable);
+            mShinyColorSwatch->setEnabled( editable );
+            mShinyColorSwatch->setCanApplyImmediately( editable );
+        }
+
+        U8 bumpy = 0;
+        // Bumpy
+        {
+            bool identical_bumpy = false;
+            LLSelectedTE::getBumpmap(bumpy,identical_bumpy);
+
+            LLUUID norm_map_id = getCurrentNormalMap();
+            LLCtrlSelectionInterface* combobox_bumpiness = childGetSelectionInterface("combobox bumpiness");
+
+            bumpy = norm_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
+
+            if (combobox_bumpiness)
+            {
+                combobox_bumpiness->selectNthItem((S32)bumpy);
+            }
+            else
+            {
+                LL_WARNS() << "failed childGetSelectionInterface for 'combobox bumpiness'" << LL_ENDL;
+            }
+
+            getChildView("combobox bumpiness")->setEnabled(editable);
+            getChild<LLUICtrl>("combobox bumpiness")->setTentative(!identical_bumpy);
+            getChildView("label bumpiness")->setEnabled(editable);
+        }
+
+        // Texture
+        {
+            mIsAlpha = FALSE;
+            LLGLenum image_format = GL_RGB;
+            bool identical_image_format = false;
+            LLSelectedTE::getImageFormat(image_format, identical_image_format);
+
+            mIsAlpha = FALSE;
+            switch (image_format)
+            {
+                case GL_RGBA:
+                case GL_ALPHA:
+                {
+                    mIsAlpha = TRUE;
+                }
+                break;
+
+                case GL_RGB: break;
+                default:
+                {
+                    LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
+                }
+                break;
+            }
+
+            if (LLViewerMedia::getInstance()->textureHasMedia(id))
+            {
+                getChildView("button align")->setEnabled(editable);
+            }
+
+            // Diffuse Alpha Mode
+
+            // Init to the default that is appropriate for the alpha content of the asset
+            //
+            U8 alpha_mode = mIsAlpha ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+
+            bool identical_alpha_mode = false;
+
+            // See if that's been overridden by a material setting for same...
+            //
+            LLSelectedTEMaterial::getCurrentDiffuseAlphaMode(alpha_mode, identical_alpha_mode, mIsAlpha);
+
+            LLCtrlSelectionInterface* combobox_alphamode = childGetSelectionInterface("combobox alphamode");
+            if (combobox_alphamode)
+            {
+                //it is invalid to have any alpha mode other than blend if transparency is greater than zero ...
+                // Want masking? Want emissive? Tough! You get BLEND!
+                alpha_mode = (transparency > 0.f) ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : alpha_mode;
+
+                // ... unless there is no alpha channel in the texture, in which case alpha mode MUST be none
+                alpha_mode = mIsAlpha ? alpha_mode : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+
+                combobox_alphamode->selectNthItem(alpha_mode);
+            }
+            else
+            {
+                LL_WARNS() << "failed childGetSelectionInterface for 'combobox alphamode'" << LL_ENDL;
+            }
+
+            updateAlphaControls();
+
+            if (texture_ctrl)
+            {
+                if (identical_diffuse)
+                {
+                    texture_ctrl->setTentative(FALSE);
+                    texture_ctrl->setEnabled(editable && !has_pbr_material);
+                    texture_ctrl->setImageAssetID(id);
+                    getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
+                    getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+                    getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+                    getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+
+                    texture_ctrl->setBakeTextureEnabled(TRUE);
+                }
+                else if (id.isNull())
+                {
+                    // None selected
+                    texture_ctrl->setTentative(FALSE);
+                    texture_ctrl->setEnabled(FALSE);
+                    texture_ctrl->setImageAssetID(LLUUID::null);
+                    getChildView("combobox alphamode")->setEnabled(FALSE);
+                    getChildView("label alphamode")->setEnabled(FALSE);
+                    getChildView("maskcutoff")->setEnabled(FALSE);
+                    getChildView("label maskcutoff")->setEnabled(FALSE);
+
+                    texture_ctrl->setBakeTextureEnabled(false);
+                }
+                else
+                {
+                    // Tentative: multiple selected with different textures
+                    texture_ctrl->setTentative(TRUE);
+                    texture_ctrl->setEnabled(editable && !has_pbr_material);
+                    texture_ctrl->setImageAssetID(id);
+                    getChildView("combobox alphamode")->setEnabled(editable && mIsAlpha && transparency <= 0.f && !has_pbr_material);
+                    getChildView("label alphamode")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+                    getChildView("maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+                    getChildView("label maskcutoff")->setEnabled(editable && mIsAlpha && !has_pbr_material);
+
+                    texture_ctrl->setBakeTextureEnabled(TRUE);
+                }
 
                 if (attachment)
                 {
@@ -1348,13 +1348,13 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 {
                     texture_ctrl->setImmediateFilterPermMask(PERM_NONE);
                 }
-			}
+            }
 
-			if (shinytexture_ctrl)
-			{
-				shinytexture_ctrl->setTentative( !identical_spec );
-				shinytexture_ctrl->setEnabled( editable && !has_pbr_material);
-				shinytexture_ctrl->setImageAssetID( specmap_id );
+            if (shinytexture_ctrl)
+            {
+                shinytexture_ctrl->setTentative( !identical_spec );
+                shinytexture_ctrl->setEnabled( editable && !has_pbr_material);
+                shinytexture_ctrl->setImageAssetID( specmap_id );
 
                 if (attachment)
                 {
@@ -1364,13 +1364,13 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 {
                     shinytexture_ctrl->setImmediateFilterPermMask(PERM_NONE);
                 }
-			}
+            }
 
-			if (bumpytexture_ctrl)
-			{
-				bumpytexture_ctrl->setTentative( !identical_norm );
-				bumpytexture_ctrl->setEnabled( editable && !has_pbr_material);
-				bumpytexture_ctrl->setImageAssetID( normmap_id );
+            if (bumpytexture_ctrl)
+            {
+                bumpytexture_ctrl->setTentative( !identical_norm );
+                bumpytexture_ctrl->setEnabled( editable && !has_pbr_material);
+                bumpytexture_ctrl->setImageAssetID( normmap_id );
 
                 if (attachment)
                 {
@@ -1380,292 +1380,292 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 {
                     bumpytexture_ctrl->setImmediateFilterPermMask(PERM_NONE);
                 }
-			}
-		}
-
-		// planar align
-		bool align_planar = false;
-		bool identical_planar_aligned = false;
-		{
-			LLCheckBoxCtrl*	cb_planar_align = getChild<LLCheckBoxCtrl>("checkbox planar align");
-			align_planar = (cb_planar_align && cb_planar_align->get());
-
-			bool enabled = (editable && isIdenticalPlanarTexgen() && !texture_info_selected);
-			childSetValue("checkbox planar align", align_planar && enabled);
+            }
+        }
+
+        // planar align
+        bool align_planar = false;
+        bool identical_planar_aligned = false;
+        {
+            LLCheckBoxCtrl* cb_planar_align = getChild<LLCheckBoxCtrl>("checkbox planar align");
+            align_planar = (cb_planar_align && cb_planar_align->get());
+
+            bool enabled = (editable && isIdenticalPlanarTexgen() && !texture_info_selected);
+            childSetValue("checkbox planar align", align_planar && enabled);
             childSetVisible("checkbox planar align", enabled);
-			childSetEnabled("checkbox planar align", enabled);
-			childSetEnabled("button align textures", enabled && LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
-
-			if (align_planar && enabled)
-			{
-				LLFace* last_face = NULL;
-				bool identical_face = false;
-				LLSelectedTE::getFace(last_face, identical_face);
-
-				LLPanelFaceGetIsAlignedTEFunctor get_is_aligend_func(last_face);
-				// this will determine if the texture param controls are tentative:
-				identical_planar_aligned = LLSelectMgr::getInstance()->getSelection()->applyToTEs(&get_is_aligend_func);
-			}
-		}
-		
-		// Needs to be public and before tex scale settings below to properly reflect
-		// behavior when in planar vs default texgen modes in the
-		// NORSPEC-84 et al
-		//
-		LLTextureEntry::e_texgen selected_texgen = LLTextureEntry::TEX_GEN_DEFAULT;
-		bool identical_texgen = true;		
-		bool identical_planar_texgen = false;
-
-		{	
-			LLSelectedTE::getTexGen(selected_texgen, identical_texgen);
-			identical_planar_texgen = (identical_texgen && (selected_texgen == LLTextureEntry::TEX_GEN_PLANAR));
-		}
-
-		// Texture scale
-		{
-			bool identical_diff_scale_s = false;
-			bool identical_spec_scale_s = false;
-			bool identical_norm_scale_s = false;
-
-			identical = align_planar ? identical_planar_aligned : identical;
-
-			F32 diff_scale_s = 1.f;			
-			F32 spec_scale_s = 1.f;
-			F32 norm_scale_s = 1.f;
-
-			LLSelectedTE::getScaleS(diff_scale_s, identical_diff_scale_s);			
-			LLSelectedTEMaterial::getSpecularRepeatX(spec_scale_s, identical_spec_scale_s);
-			LLSelectedTEMaterial::getNormalRepeatX(norm_scale_s, identical_norm_scale_s);
-
-			diff_scale_s = editable ? diff_scale_s : 1.0f;
-			diff_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
-			
-			norm_scale_s = editable ? norm_scale_s : 1.0f;
-			norm_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
-
-			spec_scale_s = editable ? spec_scale_s : 1.0f;
-			spec_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
-
-			getChild<LLUICtrl>("TexScaleU")->setValue(diff_scale_s);
-			getChild<LLUICtrl>("shinyScaleU")->setValue(spec_scale_s);
-			getChild<LLUICtrl>("bumpyScaleU")->setValue(norm_scale_s);
+            childSetEnabled("checkbox planar align", enabled);
+            childSetEnabled("button align textures", enabled && LLSelectMgr::getInstance()->getSelection()->getObjectCount() > 1);
+
+            if (align_planar && enabled)
+            {
+                LLFace* last_face = NULL;
+                bool identical_face = false;
+                LLSelectedTE::getFace(last_face, identical_face);
+
+                LLPanelFaceGetIsAlignedTEFunctor get_is_aligend_func(last_face);
+                // this will determine if the texture param controls are tentative:
+                identical_planar_aligned = LLSelectMgr::getInstance()->getSelection()->applyToTEs(&get_is_aligend_func);
+            }
+        }
+
+        // Needs to be public and before tex scale settings below to properly reflect
+        // behavior when in planar vs default texgen modes in the
+        // NORSPEC-84 et al
+        //
+        LLTextureEntry::e_texgen selected_texgen = LLTextureEntry::TEX_GEN_DEFAULT;
+        bool identical_texgen = true;
+        bool identical_planar_texgen = false;
+
+        {
+            LLSelectedTE::getTexGen(selected_texgen, identical_texgen);
+            identical_planar_texgen = (identical_texgen && (selected_texgen == LLTextureEntry::TEX_GEN_PLANAR));
+        }
+
+        // Texture scale
+        {
+            bool identical_diff_scale_s = false;
+            bool identical_spec_scale_s = false;
+            bool identical_norm_scale_s = false;
+
+            identical = align_planar ? identical_planar_aligned : identical;
+
+            F32 diff_scale_s = 1.f;
+            F32 spec_scale_s = 1.f;
+            F32 norm_scale_s = 1.f;
+
+            LLSelectedTE::getScaleS(diff_scale_s, identical_diff_scale_s);
+            LLSelectedTEMaterial::getSpecularRepeatX(spec_scale_s, identical_spec_scale_s);
+            LLSelectedTEMaterial::getNormalRepeatX(norm_scale_s, identical_norm_scale_s);
+
+            diff_scale_s = editable ? diff_scale_s : 1.0f;
+            diff_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
+
+            norm_scale_s = editable ? norm_scale_s : 1.0f;
+            norm_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
+
+            spec_scale_s = editable ? spec_scale_s : 1.0f;
+            spec_scale_s *= identical_planar_texgen ? 2.0f : 1.0f;
+
+            getChild<LLUICtrl>("TexScaleU")->setValue(diff_scale_s);
+            getChild<LLUICtrl>("shinyScaleU")->setValue(spec_scale_s);
+            getChild<LLUICtrl>("bumpyScaleU")->setValue(norm_scale_s);
 
             getChildView("TexScaleU")->setEnabled(editable && has_material);
             getChildView("shinyScaleU")->setEnabled(editable && has_material && specmap_id.notNull());
             getChildView("bumpyScaleU")->setEnabled(editable && has_material && normmap_id.notNull());
 
-			BOOL diff_scale_tentative = !(identical && identical_diff_scale_s);
-			BOOL norm_scale_tentative = !(identical && identical_norm_scale_s);
-			BOOL spec_scale_tentative = !(identical && identical_spec_scale_s);
+            BOOL diff_scale_tentative = !(identical && identical_diff_scale_s);
+            BOOL norm_scale_tentative = !(identical && identical_norm_scale_s);
+            BOOL spec_scale_tentative = !(identical && identical_spec_scale_s);
 
-			getChild<LLUICtrl>("TexScaleU")->setTentative(  LLSD(diff_scale_tentative));			
-			getChild<LLUICtrl>("shinyScaleU")->setTentative(LLSD(spec_scale_tentative));			
-			getChild<LLUICtrl>("bumpyScaleU")->setTentative(LLSD(norm_scale_tentative));
-		}
+            getChild<LLUICtrl>("TexScaleU")->setTentative(  LLSD(diff_scale_tentative));
+            getChild<LLUICtrl>("shinyScaleU")->setTentative(LLSD(spec_scale_tentative));
+            getChild<LLUICtrl>("bumpyScaleU")->setTentative(LLSD(norm_scale_tentative));
+        }
 
-		{
-			bool identical_diff_scale_t = false;
-			bool identical_spec_scale_t = false;
-			bool identical_norm_scale_t = false;
+        {
+            bool identical_diff_scale_t = false;
+            bool identical_spec_scale_t = false;
+            bool identical_norm_scale_t = false;
 
-			F32 diff_scale_t = 1.f;			
-			F32 spec_scale_t = 1.f;
-			F32 norm_scale_t = 1.f;
+            F32 diff_scale_t = 1.f;
+            F32 spec_scale_t = 1.f;
+            F32 norm_scale_t = 1.f;
 
-			LLSelectedTE::getScaleT(diff_scale_t, identical_diff_scale_t);
-			LLSelectedTEMaterial::getSpecularRepeatY(spec_scale_t, identical_spec_scale_t);
-			LLSelectedTEMaterial::getNormalRepeatY(norm_scale_t, identical_norm_scale_t);
+            LLSelectedTE::getScaleT(diff_scale_t, identical_diff_scale_t);
+            LLSelectedTEMaterial::getSpecularRepeatY(spec_scale_t, identical_spec_scale_t);
+            LLSelectedTEMaterial::getNormalRepeatY(norm_scale_t, identical_norm_scale_t);
 
-			diff_scale_t = editable ? diff_scale_t : 1.0f;
-			diff_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
+            diff_scale_t = editable ? diff_scale_t : 1.0f;
+            diff_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
 
-			norm_scale_t = editable ? norm_scale_t : 1.0f;
-			norm_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
+            norm_scale_t = editable ? norm_scale_t : 1.0f;
+            norm_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
 
-			spec_scale_t = editable ? spec_scale_t : 1.0f;
-			spec_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
+            spec_scale_t = editable ? spec_scale_t : 1.0f;
+            spec_scale_t *= identical_planar_texgen ? 2.0f : 1.0f;
 
-			BOOL diff_scale_tentative = !identical_diff_scale_t;
-			BOOL norm_scale_tentative = !identical_norm_scale_t;
-			BOOL spec_scale_tentative = !identical_spec_scale_t;
+            BOOL diff_scale_tentative = !identical_diff_scale_t;
+            BOOL norm_scale_tentative = !identical_norm_scale_t;
+            BOOL spec_scale_tentative = !identical_spec_scale_t;
 
             getChildView("TexScaleV")->setEnabled(editable && has_material);
             getChildView("shinyScaleV")->setEnabled(editable && has_material && specmap_id.notNull());
             getChildView("bumpyScaleV")->setEnabled(editable && has_material && normmap_id.notNull());
 
-			if (force_set_values)
-			{
-				getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(diff_scale_t);
-			}
-			else
-			{
-				getChild<LLSpinCtrl>("TexScaleV")->setValue(diff_scale_t);
-			}
-			getChild<LLUICtrl>("shinyScaleV")->setValue(norm_scale_t);
-			getChild<LLUICtrl>("bumpyScaleV")->setValue(spec_scale_t);
-
-			getChild<LLUICtrl>("TexScaleV")->setTentative(LLSD(diff_scale_tentative));
-			getChild<LLUICtrl>("shinyScaleV")->setTentative(LLSD(norm_scale_tentative));
-			getChild<LLUICtrl>("bumpyScaleV")->setTentative(LLSD(spec_scale_tentative));
-		}
-
-		// Texture offset
-		{
-			bool identical_diff_offset_s = false;
-			bool identical_norm_offset_s = false;
-			bool identical_spec_offset_s = false;
-
-			F32 diff_offset_s = 0.0f;
-			F32 norm_offset_s = 0.0f;
-			F32 spec_offset_s = 0.0f;
-
-			LLSelectedTE::getOffsetS(diff_offset_s, identical_diff_offset_s);
-			LLSelectedTEMaterial::getNormalOffsetX(norm_offset_s, identical_norm_offset_s);
-			LLSelectedTEMaterial::getSpecularOffsetX(spec_offset_s, identical_spec_offset_s);
-
-			BOOL diff_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_diff_offset_s);
-			BOOL norm_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_norm_offset_s);
-			BOOL spec_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_spec_offset_s);
-
-			getChild<LLUICtrl>("TexOffsetU")->setValue(  editable ? diff_offset_s : 0.0f);
-			getChild<LLUICtrl>("bumpyOffsetU")->setValue(editable ? norm_offset_s : 0.0f);
-			getChild<LLUICtrl>("shinyOffsetU")->setValue(editable ? spec_offset_s : 0.0f);
-
-			getChild<LLUICtrl>("TexOffsetU")->setTentative(LLSD(diff_offset_u_tentative));
-			getChild<LLUICtrl>("shinyOffsetU")->setTentative(LLSD(norm_offset_u_tentative));
-			getChild<LLUICtrl>("bumpyOffsetU")->setTentative(LLSD(spec_offset_u_tentative));
+            if (force_set_values)
+            {
+                getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(diff_scale_t);
+            }
+            else
+            {
+                getChild<LLSpinCtrl>("TexScaleV")->setValue(diff_scale_t);
+            }
+            getChild<LLUICtrl>("shinyScaleV")->setValue(norm_scale_t);
+            getChild<LLUICtrl>("bumpyScaleV")->setValue(spec_scale_t);
+
+            getChild<LLUICtrl>("TexScaleV")->setTentative(LLSD(diff_scale_tentative));
+            getChild<LLUICtrl>("shinyScaleV")->setTentative(LLSD(norm_scale_tentative));
+            getChild<LLUICtrl>("bumpyScaleV")->setTentative(LLSD(spec_scale_tentative));
+        }
+
+        // Texture offset
+        {
+            bool identical_diff_offset_s = false;
+            bool identical_norm_offset_s = false;
+            bool identical_spec_offset_s = false;
+
+            F32 diff_offset_s = 0.0f;
+            F32 norm_offset_s = 0.0f;
+            F32 spec_offset_s = 0.0f;
+
+            LLSelectedTE::getOffsetS(diff_offset_s, identical_diff_offset_s);
+            LLSelectedTEMaterial::getNormalOffsetX(norm_offset_s, identical_norm_offset_s);
+            LLSelectedTEMaterial::getSpecularOffsetX(spec_offset_s, identical_spec_offset_s);
+
+            BOOL diff_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_diff_offset_s);
+            BOOL norm_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_norm_offset_s);
+            BOOL spec_offset_u_tentative = !(align_planar ? identical_planar_aligned : identical_spec_offset_s);
+
+            getChild<LLUICtrl>("TexOffsetU")->setValue(  editable ? diff_offset_s : 0.0f);
+            getChild<LLUICtrl>("bumpyOffsetU")->setValue(editable ? norm_offset_s : 0.0f);
+            getChild<LLUICtrl>("shinyOffsetU")->setValue(editable ? spec_offset_s : 0.0f);
+
+            getChild<LLUICtrl>("TexOffsetU")->setTentative(LLSD(diff_offset_u_tentative));
+            getChild<LLUICtrl>("shinyOffsetU")->setTentative(LLSD(norm_offset_u_tentative));
+            getChild<LLUICtrl>("bumpyOffsetU")->setTentative(LLSD(spec_offset_u_tentative));
 
             getChildView("TexOffsetU")->setEnabled(editable && has_material);
             getChildView("shinyOffsetU")->setEnabled(editable && has_material && specmap_id.notNull());
             getChildView("bumpyOffsetU")->setEnabled(editable && has_material && normmap_id.notNull());
-		}
+        }
 
-		{
-			bool identical_diff_offset_t = false;
-			bool identical_norm_offset_t = false;
-			bool identical_spec_offset_t = false;
+        {
+            bool identical_diff_offset_t = false;
+            bool identical_norm_offset_t = false;
+            bool identical_spec_offset_t = false;
+
+            F32 diff_offset_t = 0.0f;
+            F32 norm_offset_t = 0.0f;
+            F32 spec_offset_t = 0.0f;
 
-			F32 diff_offset_t = 0.0f;
-			F32 norm_offset_t = 0.0f;
-			F32 spec_offset_t = 0.0f;
+            LLSelectedTE::getOffsetT(diff_offset_t, identical_diff_offset_t);
+            LLSelectedTEMaterial::getNormalOffsetY(norm_offset_t, identical_norm_offset_t);
+            LLSelectedTEMaterial::getSpecularOffsetY(spec_offset_t, identical_spec_offset_t);
 
-			LLSelectedTE::getOffsetT(diff_offset_t, identical_diff_offset_t);
-			LLSelectedTEMaterial::getNormalOffsetY(norm_offset_t, identical_norm_offset_t);
-			LLSelectedTEMaterial::getSpecularOffsetY(spec_offset_t, identical_spec_offset_t);
-			
-			BOOL diff_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_diff_offset_t);
-			BOOL norm_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_norm_offset_t);
-			BOOL spec_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_spec_offset_t);
+            BOOL diff_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_diff_offset_t);
+            BOOL norm_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_norm_offset_t);
+            BOOL spec_offset_v_tentative = !(align_planar ? identical_planar_aligned : identical_spec_offset_t);
 
-			getChild<LLUICtrl>("TexOffsetV")->setValue(  editable ? diff_offset_t : 0.0f);
-			getChild<LLUICtrl>("bumpyOffsetV")->setValue(editable ? norm_offset_t : 0.0f);
-			getChild<LLUICtrl>("shinyOffsetV")->setValue(editable ? spec_offset_t : 0.0f);
+            getChild<LLUICtrl>("TexOffsetV")->setValue(  editable ? diff_offset_t : 0.0f);
+            getChild<LLUICtrl>("bumpyOffsetV")->setValue(editable ? norm_offset_t : 0.0f);
+            getChild<LLUICtrl>("shinyOffsetV")->setValue(editable ? spec_offset_t : 0.0f);
 
-			getChild<LLUICtrl>("TexOffsetV")->setTentative(LLSD(diff_offset_v_tentative));
-			getChild<LLUICtrl>("shinyOffsetV")->setTentative(LLSD(norm_offset_v_tentative));
-			getChild<LLUICtrl>("bumpyOffsetV")->setTentative(LLSD(spec_offset_v_tentative));
+            getChild<LLUICtrl>("TexOffsetV")->setTentative(LLSD(diff_offset_v_tentative));
+            getChild<LLUICtrl>("shinyOffsetV")->setTentative(LLSD(norm_offset_v_tentative));
+            getChild<LLUICtrl>("bumpyOffsetV")->setTentative(LLSD(spec_offset_v_tentative));
 
             getChildView("TexOffsetV")->setEnabled(editable && has_material);
             getChildView("shinyOffsetV")->setEnabled(editable && has_material && specmap_id.notNull());
             getChildView("bumpyOffsetV")->setEnabled(editable && has_material && normmap_id.notNull());
-		}
+        }
 
-		// Texture rotation
-		{
-			bool identical_diff_rotation = false;
-			bool identical_norm_rotation = false;
-			bool identical_spec_rotation = false;
+        // Texture rotation
+        {
+            bool identical_diff_rotation = false;
+            bool identical_norm_rotation = false;
+            bool identical_spec_rotation = false;
 
-			F32 diff_rotation = 0.f;
-			F32 norm_rotation = 0.f;
-			F32 spec_rotation = 0.f;
+            F32 diff_rotation = 0.f;
+            F32 norm_rotation = 0.f;
+            F32 spec_rotation = 0.f;
 
-			LLSelectedTE::getRotation(diff_rotation,identical_diff_rotation);
-			LLSelectedTEMaterial::getSpecularRotation(spec_rotation,identical_spec_rotation);
-			LLSelectedTEMaterial::getNormalRotation(norm_rotation,identical_norm_rotation);
+            LLSelectedTE::getRotation(diff_rotation,identical_diff_rotation);
+            LLSelectedTEMaterial::getSpecularRotation(spec_rotation,identical_spec_rotation);
+            LLSelectedTEMaterial::getNormalRotation(norm_rotation,identical_norm_rotation);
 
-			BOOL diff_rot_tentative = !(align_planar ? identical_planar_aligned : identical_diff_rotation);
-			BOOL norm_rot_tentative = !(align_planar ? identical_planar_aligned : identical_norm_rotation);
-			BOOL spec_rot_tentative = !(align_planar ? identical_planar_aligned : identical_spec_rotation);
+            BOOL diff_rot_tentative = !(align_planar ? identical_planar_aligned : identical_diff_rotation);
+            BOOL norm_rot_tentative = !(align_planar ? identical_planar_aligned : identical_norm_rotation);
+            BOOL spec_rot_tentative = !(align_planar ? identical_planar_aligned : identical_spec_rotation);
 
-			F32 diff_rot_deg = diff_rotation * RAD_TO_DEG;
-			F32 norm_rot_deg = norm_rotation * RAD_TO_DEG;
-			F32 spec_rot_deg = spec_rotation * RAD_TO_DEG;
+            F32 diff_rot_deg = diff_rotation * RAD_TO_DEG;
+            F32 norm_rot_deg = norm_rotation * RAD_TO_DEG;
+            F32 spec_rot_deg = spec_rotation * RAD_TO_DEG;
 
             getChildView("TexRot")->setEnabled(editable && has_material);
             getChildView("shinyRot")->setEnabled(editable && has_material && specmap_id.notNull());
             getChildView("bumpyRot")->setEnabled(editable && has_material && normmap_id.notNull());
 
-			getChild<LLUICtrl>("TexRot")->setTentative(diff_rot_tentative);
-			getChild<LLUICtrl>("shinyRot")->setTentative(LLSD(norm_rot_tentative));
-			getChild<LLUICtrl>("bumpyRot")->setTentative(LLSD(spec_rot_tentative));
-
-			getChild<LLUICtrl>("TexRot")->setValue(  editable ? diff_rot_deg : 0.0f);			
-			getChild<LLUICtrl>("shinyRot")->setValue(editable ? spec_rot_deg : 0.0f);
-			getChild<LLUICtrl>("bumpyRot")->setValue(editable ? norm_rot_deg : 0.0f);
-		}
-
-		{
-			F32 glow = 0.f;
-			bool identical_glow = false;
-			LLSelectedTE::getGlow(glow,identical_glow);
-			getChild<LLUICtrl>("glow")->setValue(glow);
-			getChild<LLUICtrl>("glow")->setTentative(!identical_glow);
-			getChildView("glow")->setEnabled(editable);
-			getChildView("glow label")->setEnabled(editable);
-		}
-
-		{
-			LLCtrlSelectionInterface* combobox_texgen = childGetSelectionInterface("combobox texgen");
-			if (combobox_texgen)
-			{
-				// Maps from enum to combobox entry index
-				combobox_texgen->selectNthItem(((S32)selected_texgen) >> 1);
-			}
-			else
-			{
-				LL_WARNS() << "failed childGetSelectionInterface for 'combobox texgen'" << LL_ENDL;
-			}
-
-			getChildView("combobox texgen")->setEnabled(editable);
-			getChild<LLUICtrl>("combobox texgen")->setTentative(!identical);
-			getChildView("tex gen")->setEnabled(editable);
-		}
-
-		{
-			U8 fullbright_flag = 0;
-			bool identical_fullbright = false;
-			
-			LLSelectedTE::getFullbright(fullbright_flag,identical_fullbright);
-
-			getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0));
-			getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material);
-			getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright);
+            getChild<LLUICtrl>("TexRot")->setTentative(diff_rot_tentative);
+            getChild<LLUICtrl>("shinyRot")->setTentative(LLSD(norm_rot_tentative));
+            getChild<LLUICtrl>("bumpyRot")->setTentative(LLSD(spec_rot_tentative));
+
+            getChild<LLUICtrl>("TexRot")->setValue(  editable ? diff_rot_deg : 0.0f);
+            getChild<LLUICtrl>("shinyRot")->setValue(editable ? spec_rot_deg : 0.0f);
+            getChild<LLUICtrl>("bumpyRot")->setValue(editable ? norm_rot_deg : 0.0f);
+        }
+
+        {
+            F32 glow = 0.f;
+            bool identical_glow = false;
+            LLSelectedTE::getGlow(glow,identical_glow);
+            getChild<LLUICtrl>("glow")->setValue(glow);
+            getChild<LLUICtrl>("glow")->setTentative(!identical_glow);
+            getChildView("glow")->setEnabled(editable);
+            getChildView("glow label")->setEnabled(editable);
+        }
+
+        {
+            LLCtrlSelectionInterface* combobox_texgen = childGetSelectionInterface("combobox texgen");
+            if (combobox_texgen)
+            {
+                // Maps from enum to combobox entry index
+                combobox_texgen->selectNthItem(((S32)selected_texgen) >> 1);
+            }
+            else
+            {
+                LL_WARNS() << "failed childGetSelectionInterface for 'combobox texgen'" << LL_ENDL;
+            }
+
+            getChildView("combobox texgen")->setEnabled(editable);
+            getChild<LLUICtrl>("combobox texgen")->setTentative(!identical);
+            getChildView("tex gen")->setEnabled(editable);
+        }
+
+        {
+            U8 fullbright_flag = 0;
+            bool identical_fullbright = false;
+
+            LLSelectedTE::getFullbright(fullbright_flag,identical_fullbright);
+
+            getChild<LLUICtrl>("checkbox fullbright")->setValue((S32)(fullbright_flag != 0));
+            getChildView("checkbox fullbright")->setEnabled(editable && !has_pbr_material);
+            getChild<LLUICtrl>("checkbox fullbright")->setTentative(!identical_fullbright);
             mComboMatMedia->setEnabledByValue("Materials", !has_pbr_material);
-		}
-		
-		// Repeats per meter
-		{
-			F32 repeats_diff = 1.f;
-			F32 repeats_norm = 1.f;
-			F32 repeats_spec = 1.f;
-
-			bool identical_diff_repeats = false;
-			bool identical_norm_repeats = false;
-			bool identical_spec_repeats = false;
-
-			LLSelectedTE::getMaxDiffuseRepeats(repeats_diff, identical_diff_repeats);
-			LLSelectedTEMaterial::getMaxNormalRepeats(repeats_norm, identical_norm_repeats);
-			LLSelectedTEMaterial::getMaxSpecularRepeats(repeats_spec, identical_spec_repeats);			
-
-			LLComboBox*	mComboTexGen = getChild<LLComboBox>("combobox texgen");
-			if (mComboTexGen)
-			{
-				S32 index = mComboTexGen ? mComboTexGen->getCurrentIndex() : 0;
+        }
+
+        // Repeats per meter
+        {
+            F32 repeats_diff = 1.f;
+            F32 repeats_norm = 1.f;
+            F32 repeats_spec = 1.f;
+
+            bool identical_diff_repeats = false;
+            bool identical_norm_repeats = false;
+            bool identical_spec_repeats = false;
+
+            LLSelectedTE::getMaxDiffuseRepeats(repeats_diff, identical_diff_repeats);
+            LLSelectedTEMaterial::getMaxNormalRepeats(repeats_norm, identical_norm_repeats);
+            LLSelectedTEMaterial::getMaxSpecularRepeats(repeats_spec, identical_spec_repeats);
+
+            LLComboBox* mComboTexGen = getChild<LLComboBox>("combobox texgen");
+            if (mComboTexGen)
+            {
+                S32 index = mComboTexGen ? mComboTexGen->getCurrentIndex() : 0;
                 bool enabled = editable && (index != 1);
                 bool identical_repeats = true;
                 S32 material_selection = mComboMatMedia->getCurrentIndex();
-				F32  repeats = 1.0f;
+                F32  repeats = 1.0f;
 
                 U32 material_type = MATTYPE_DIFFUSE;
                 if (material_selection == MATMEDIA_MATERIAL)
@@ -1715,194 +1715,194 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
                 break;
                 }
 
-				BOOL repeats_tentative = !identical_repeats;
-
-				LLSpinCtrl* rpt_ctrl = getChild<LLSpinCtrl>("rptctrl");
-				if (force_set_values)
-				{
-					//onCommit, previosly edited element updates related ones
-					rpt_ctrl->forceSetValue(editable ? repeats : 1.0f);
-				}
-				else
-				{
-					rpt_ctrl->setValue(editable ? repeats : 1.0f);
-				}
-				rpt_ctrl->setTentative(LLSD(repeats_tentative));
+                BOOL repeats_tentative = !identical_repeats;
+
+                LLSpinCtrl* rpt_ctrl = getChild<LLSpinCtrl>("rptctrl");
+                if (force_set_values)
+                {
+                    //onCommit, previosly edited element updates related ones
+                    rpt_ctrl->forceSetValue(editable ? repeats : 1.0f);
+                }
+                else
+                {
+                    rpt_ctrl->setValue(editable ? repeats : 1.0f);
+                }
+                rpt_ctrl->setTentative(LLSD(repeats_tentative));
                 rpt_ctrl->setEnabled(has_material && !identical_planar_texgen && enabled);
-			}
-		}
+            }
+        }
 
-		// Materials
-		{
-			LLMaterialPtr material;
-			LLSelectedTEMaterial::getCurrent(material, identical);
+        // Materials
+        {
+            LLMaterialPtr material;
+            LLSelectedTEMaterial::getCurrent(material, identical);
 
             if (material && editable)
-			{
-				LL_DEBUGS("Materials") << material->asLLSD() << LL_ENDL;
-
-				// Alpha
-				LLCtrlSelectionInterface* combobox_alphamode =
-					childGetSelectionInterface("combobox alphamode");
-				if (combobox_alphamode)
-				{
-					U32 alpha_mode = material->getDiffuseAlphaMode();
-
-					if (transparency > 0.f)
-					{ //it is invalid to have any alpha mode other than blend if transparency is greater than zero ... 
-						alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_BLEND;
-					}
-
-					if (!mIsAlpha)
-					{ // ... unless there is no alpha channel in the texture, in which case alpha mode MUST ebe none
-						alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-					}
-
-					combobox_alphamode->selectNthItem(alpha_mode);
-				}
-				else
-				{
-					LL_WARNS() << "failed childGetSelectionInterface for 'combobox alphamode'" << LL_ENDL;
-				}
-				getChild<LLUICtrl>("maskcutoff")->setValue(material->getAlphaMaskCutoff());
-				updateAlphaControls();
-
-				identical_planar_texgen = isIdenticalPlanarTexgen();
-
-				// Shiny (specular)
-				F32 offset_x, offset_y, repeat_x, repeat_y, rot;
-				LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
-				texture_ctrl->setImageAssetID(material->getSpecularID());
-
-				if (!material->getSpecularID().isNull() && (shiny == SHINY_TEXTURE))
-				{
-					material->getSpecularOffset(offset_x,offset_y);
-					material->getSpecularRepeat(repeat_x,repeat_y);
-
-					if (identical_planar_texgen)
-					{
-						repeat_x *= 2.0f;
-						repeat_y *= 2.0f;
-					}
-
-					rot = material->getSpecularRotation();
-					getChild<LLUICtrl>("shinyScaleU")->setValue(repeat_x);
-					getChild<LLUICtrl>("shinyScaleV")->setValue(repeat_y);
-					getChild<LLUICtrl>("shinyRot")->setValue(rot*RAD_TO_DEG);
-					getChild<LLUICtrl>("shinyOffsetU")->setValue(offset_x);
-					getChild<LLUICtrl>("shinyOffsetV")->setValue(offset_y);
-					getChild<LLUICtrl>("glossiness")->setValue(material->getSpecularLightExponent());
-					getChild<LLUICtrl>("environment")->setValue(material->getEnvironmentIntensity());
-
-					updateShinyControls(!material->getSpecularID().isNull(), true);
-				}
-
-				// Assert desired colorswatch color to match material AFTER updateShinyControls
-				// to avoid getting overwritten with the default on some UI state changes.
-				//
-				if (!material->getSpecularID().isNull())
-				{
-					LLColorSwatchCtrl*	shiny_swatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
-					LLColor4 new_color = material->getSpecularLightColor();
-					LLColor4 old_color = shiny_swatch->get();
-
-					shiny_swatch->setOriginal(new_color);
-					shiny_swatch->set(new_color, force_set_values || old_color != new_color || !editable);
-				}
-
-				// Bumpy (normal)
-				texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
-				texture_ctrl->setImageAssetID(material->getNormalID());
-
-				if (!material->getNormalID().isNull())
-				{
-					material->getNormalOffset(offset_x,offset_y);
-					material->getNormalRepeat(repeat_x,repeat_y);
-
-					if (identical_planar_texgen)
-					{
-						repeat_x *= 2.0f;
-						repeat_y *= 2.0f;
-					}
-			
-					rot = material->getNormalRotation();
-					getChild<LLUICtrl>("bumpyScaleU")->setValue(repeat_x);
-					getChild<LLUICtrl>("bumpyScaleV")->setValue(repeat_y);
-					getChild<LLUICtrl>("bumpyRot")->setValue(rot*RAD_TO_DEG);
-					getChild<LLUICtrl>("bumpyOffsetU")->setValue(offset_x);
-					getChild<LLUICtrl>("bumpyOffsetV")->setValue(offset_y);
-
-					updateBumpyControls(!material->getNormalID().isNull(), true);
-				}
-			}
-		}
+            {
+                LL_DEBUGS("Materials") << material->asLLSD() << LL_ENDL;
+
+                // Alpha
+                LLCtrlSelectionInterface* combobox_alphamode =
+                    childGetSelectionInterface("combobox alphamode");
+                if (combobox_alphamode)
+                {
+                    U32 alpha_mode = material->getDiffuseAlphaMode();
+
+                    if (transparency > 0.f)
+                    { //it is invalid to have any alpha mode other than blend if transparency is greater than zero ...
+                        alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_BLEND;
+                    }
+
+                    if (!mIsAlpha)
+                    { // ... unless there is no alpha channel in the texture, in which case alpha mode MUST ebe none
+                        alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+                    }
+
+                    combobox_alphamode->selectNthItem(alpha_mode);
+                }
+                else
+                {
+                    LL_WARNS() << "failed childGetSelectionInterface for 'combobox alphamode'" << LL_ENDL;
+                }
+                getChild<LLUICtrl>("maskcutoff")->setValue(material->getAlphaMaskCutoff());
+                updateAlphaControls();
+
+                identical_planar_texgen = isIdenticalPlanarTexgen();
+
+                // Shiny (specular)
+                F32 offset_x, offset_y, repeat_x, repeat_y, rot;
+                LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
+                texture_ctrl->setImageAssetID(material->getSpecularID());
+
+                if (!material->getSpecularID().isNull() && (shiny == SHINY_TEXTURE))
+                {
+                    material->getSpecularOffset(offset_x,offset_y);
+                    material->getSpecularRepeat(repeat_x,repeat_y);
+
+                    if (identical_planar_texgen)
+                    {
+                        repeat_x *= 2.0f;
+                        repeat_y *= 2.0f;
+                    }
+
+                    rot = material->getSpecularRotation();
+                    getChild<LLUICtrl>("shinyScaleU")->setValue(repeat_x);
+                    getChild<LLUICtrl>("shinyScaleV")->setValue(repeat_y);
+                    getChild<LLUICtrl>("shinyRot")->setValue(rot*RAD_TO_DEG);
+                    getChild<LLUICtrl>("shinyOffsetU")->setValue(offset_x);
+                    getChild<LLUICtrl>("shinyOffsetV")->setValue(offset_y);
+                    getChild<LLUICtrl>("glossiness")->setValue(material->getSpecularLightExponent());
+                    getChild<LLUICtrl>("environment")->setValue(material->getEnvironmentIntensity());
+
+                    updateShinyControls(!material->getSpecularID().isNull(), true);
+                }
+
+                // Assert desired colorswatch color to match material AFTER updateShinyControls
+                // to avoid getting overwritten with the default on some UI state changes.
+                //
+                if (!material->getSpecularID().isNull())
+                {
+                    LLColorSwatchCtrl*  shiny_swatch = getChild<LLColorSwatchCtrl>("shinycolorswatch");
+                    LLColor4 new_color = material->getSpecularLightColor();
+                    LLColor4 old_color = shiny_swatch->get();
+
+                    shiny_swatch->setOriginal(new_color);
+                    shiny_swatch->set(new_color, force_set_values || old_color != new_color || !editable);
+                }
+
+                // Bumpy (normal)
+                texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
+                texture_ctrl->setImageAssetID(material->getNormalID());
+
+                if (!material->getNormalID().isNull())
+                {
+                    material->getNormalOffset(offset_x,offset_y);
+                    material->getNormalRepeat(repeat_x,repeat_y);
+
+                    if (identical_planar_texgen)
+                    {
+                        repeat_x *= 2.0f;
+                        repeat_y *= 2.0f;
+                    }
+
+                    rot = material->getNormalRotation();
+                    getChild<LLUICtrl>("bumpyScaleU")->setValue(repeat_x);
+                    getChild<LLUICtrl>("bumpyScaleV")->setValue(repeat_y);
+                    getChild<LLUICtrl>("bumpyRot")->setValue(rot*RAD_TO_DEG);
+                    getChild<LLUICtrl>("bumpyOffsetU")->setValue(offset_x);
+                    getChild<LLUICtrl>("bumpyOffsetV")->setValue(offset_y);
+
+                    updateBumpyControls(!material->getNormalID().isNull(), true);
+                }
+            }
+        }
         S32 selected_count = LLSelectMgr::getInstance()->getSelection()->getObjectCount();
         BOOL single_volume = (selected_count == 1);
         mMenuClipboardColor->setEnabled(editable && single_volume);
 
-		// Set variable values for numeric expressions
-		LLCalc* calcp = LLCalc::getInstance();
-		calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
-		calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal());
-		calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal());
-		calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal());
-		calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal());
-		calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal());
-		calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal());
-	}
-	else
-	{
-		// Disable all UICtrls
-		clearCtrls();
-
-		// Disable non-UICtrls
-        LLTextureCtrl*	pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
+        // Set variable values for numeric expressions
+        LLCalc* calcp = LLCalc::getInstance();
+        calcp->setVar(LLCalc::TEX_U_SCALE, childGetValue("TexScaleU").asReal());
+        calcp->setVar(LLCalc::TEX_V_SCALE, childGetValue("TexScaleV").asReal());
+        calcp->setVar(LLCalc::TEX_U_OFFSET, childGetValue("TexOffsetU").asReal());
+        calcp->setVar(LLCalc::TEX_V_OFFSET, childGetValue("TexOffsetV").asReal());
+        calcp->setVar(LLCalc::TEX_ROTATION, childGetValue("TexRot").asReal());
+        calcp->setVar(LLCalc::TEX_TRANSPARENCY, childGetValue("ColorTrans").asReal());
+        calcp->setVar(LLCalc::TEX_GLOW, childGetValue("glow").asReal());
+    }
+    else
+    {
+        // Disable all UICtrls
+        clearCtrls();
+
+        // Disable non-UICtrls
+        LLTextureCtrl*  pbr_ctrl = findChild<LLTextureCtrl>("pbr_control");
         if (pbr_ctrl)
         {
             pbr_ctrl->setImageAssetID(LLUUID::null);
             pbr_ctrl->setEnabled(FALSE);
         }
-		LLTextureCtrl*	texture_ctrl = getChild<LLTextureCtrl>("texture control"); 
-		if (texture_ctrl)
-		{
-			texture_ctrl->setImageAssetID( LLUUID::null );
-			texture_ctrl->setEnabled( FALSE );  // this is a LLUICtrl, but we don't want it to have keyboard focus so we add it as a child, not a ctrl.
-// 			texture_ctrl->setValid(FALSE);
-		}
-		LLColorSwatchCtrl* mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
-		if (mColorSwatch)
-		{
-			mColorSwatch->setEnabled( FALSE );			
-			mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") );
-			mColorSwatch->setValid(FALSE);
-		}
-		LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
-		if (radio_mat_type)
-		{
-			radio_mat_type->setSelectedIndex(0);
-		}
-		getChildView("color trans")->setEnabled(FALSE);
-		getChildView("rptctrl")->setEnabled(FALSE);
-		getChildView("tex gen")->setEnabled(FALSE);
-		getChildView("label shininess")->setEnabled(FALSE);
-		getChildView("label bumpiness")->setEnabled(FALSE);
-		getChildView("button align")->setEnabled(FALSE);
+        LLTextureCtrl*  texture_ctrl = getChild<LLTextureCtrl>("texture control");
+        if (texture_ctrl)
+        {
+            texture_ctrl->setImageAssetID( LLUUID::null );
+            texture_ctrl->setEnabled( FALSE );  // this is a LLUICtrl, but we don't want it to have keyboard focus so we add it as a child, not a ctrl.
+//          texture_ctrl->setValid(FALSE);
+        }
+        LLColorSwatchCtrl* mColorSwatch = getChild<LLColorSwatchCtrl>("colorswatch");
+        if (mColorSwatch)
+        {
+            mColorSwatch->setEnabled( FALSE );
+            mColorSwatch->setFallbackImage(LLUI::getUIImage("locked_image.j2c") );
+            mColorSwatch->setValid(FALSE);
+        }
+        LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
+        if (radio_mat_type)
+        {
+            radio_mat_type->setSelectedIndex(0);
+        }
+        getChildView("color trans")->setEnabled(FALSE);
+        getChildView("rptctrl")->setEnabled(FALSE);
+        getChildView("tex gen")->setEnabled(FALSE);
+        getChildView("label shininess")->setEnabled(FALSE);
+        getChildView("label bumpiness")->setEnabled(FALSE);
+        getChildView("button align")->setEnabled(FALSE);
         getChildView("pbr_from_inventory")->setEnabled(FALSE);
         getChildView("edit_selected_pbr")->setEnabled(FALSE);
         getChildView("save_selected_pbr")->setEnabled(FALSE);
-		
-		updateVisibility();
 
-		// Set variable values for numeric expressions
-		LLCalc* calcp = LLCalc::getInstance();
-		calcp->clearVar(LLCalc::TEX_U_SCALE);
-		calcp->clearVar(LLCalc::TEX_V_SCALE);
-		calcp->clearVar(LLCalc::TEX_U_OFFSET);
-		calcp->clearVar(LLCalc::TEX_V_OFFSET);
-		calcp->clearVar(LLCalc::TEX_ROTATION);
-		calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
-		calcp->clearVar(LLCalc::TEX_GLOW);		
-	}
+        updateVisibility();
+
+        // Set variable values for numeric expressions
+        LLCalc* calcp = LLCalc::getInstance();
+        calcp->clearVar(LLCalc::TEX_U_SCALE);
+        calcp->clearVar(LLCalc::TEX_V_SCALE);
+        calcp->clearVar(LLCalc::TEX_U_OFFSET);
+        calcp->clearVar(LLCalc::TEX_V_OFFSET);
+        calcp->clearVar(LLCalc::TEX_ROTATION);
+        calcp->clearVar(LLCalc::TEX_TRANSPARENCY);
+        calcp->clearVar(LLCalc::TEX_GLOW);
+    }
 }
 
 // One-off listener that updates the build floater UI when the agent inventory adds or removes an item
@@ -1911,7 +1911,7 @@ class PBRPickerAgentListener : public LLInventoryObserver
 protected:
     bool mChangePending = true;
 public:
-	PBRPickerAgentListener() : LLInventoryObserver()
+    PBRPickerAgentListener() : LLInventoryObserver()
     {
         gInventory.addObserver(this);
     }
@@ -1921,7 +1921,7 @@ public:
         return mChangePending;
     }
 
-	void changed(U32 mask) override
+    void changed(U32 mask) override
     {
         if (!(mask & (ADD | REMOVE)))
         {
@@ -2091,8 +2091,8 @@ void LLPanelFace::updateVisibilityGLTF(LLViewerObject* objectp /*= nullptr */)
 void LLPanelFace::updateCopyTexButton()
 {
     LLViewerObject* objectp = LLSelectMgr::getInstance()->getSelection()->getFirstObject();
-    mMenuClipboardTexture->setEnabled(objectp && objectp->getPCode() == LL_PCODE_VOLUME && objectp->permModify() 
-                                                    && !objectp->isPermanentEnforced() && !objectp->isInventoryPending() 
+    mMenuClipboardTexture->setEnabled(objectp && objectp->getPCode() == LL_PCODE_VOLUME && objectp->permModify()
+                                                    && !objectp->isPermanentEnforced() && !objectp->isInventoryPending()
                                                     && (LLSelectMgr::getInstance()->getSelection()->getObjectCount() == 1)
                                                     && LLMaterialEditor::canClipboardObjectsMaterial());
     std::string tooltip = (objectp && objectp->isInventoryPending()) ? LLTrans::getString("LoadingContents") : getString("paste_options");
@@ -2101,8 +2101,8 @@ void LLPanelFace::updateCopyTexButton()
 
 void LLPanelFace::refresh()
 {
-	LL_DEBUGS("Materials") << LL_ENDL;
-	getState();
+    LL_DEBUGS("Materials") << LL_ENDL;
+    getState();
 }
 
 void LLPanelFace::refreshMedia()
@@ -2223,7 +2223,7 @@ void LLPanelFace::refreshMedia()
                 // initial media title is the media URL (until we get the name)
                 media_title = media_data_get.getHomeURL();
             }
-            // else all faces might be empty. 
+            // else all faces might be empty.
         }
         else // there' re Different Medias' been set on on the faces.
         {
@@ -2295,19 +2295,19 @@ void LLPanelFace::onMaterialOverrideReceived(const LLUUID& object_id, S32 side)
 //
 void LLPanelFace::navigateToTitleMedia( const std::string url )
 {
-	std::string multi_media_info_str = LLTrans::getString("Multiple Media");
-	if (url.empty() || multi_media_info_str == url)
-	{
-		// nothing to show
-		mNeedMediaTitle = false;
-	}
-	else if (mTitleMedia)
-	{
-		LLPluginClassMedia* media_plugin = mTitleMedia->getMediaPlugin();
-		// check if url changed or if we need a new media source
-		if (mTitleMedia->getCurrentNavUrl() != url || media_plugin == NULL)
-		{
-			mTitleMedia->navigateTo( url );
+    std::string multi_media_info_str = LLTrans::getString("Multiple Media");
+    if (url.empty() || multi_media_info_str == url)
+    {
+        // nothing to show
+        mNeedMediaTitle = false;
+    }
+    else if (mTitleMedia)
+    {
+        LLPluginClassMedia* media_plugin = mTitleMedia->getMediaPlugin();
+        // check if url changed or if we need a new media source
+        if (mTitleMedia->getCurrentNavUrl() != url || media_plugin == NULL)
+        {
+            mTitleMedia->navigateTo( url );
 
             LLViewerMediaImpl* impl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(mTitleMedia->getTextureID());
             if (impl)
@@ -2315,11 +2315,11 @@ void LLPanelFace::navigateToTitleMedia( const std::string url )
                 // if it's a page with a movie, we don't want to hear it
                 impl->setVolume(0);
             };
-		}
+        }
 
-		// flag that we need to update the title (even if no request were made)
-		mNeedMediaTitle = true;
-	}
+        // flag that we need to update the title (even if no request were made)
+        mNeedMediaTitle = true;
+    }
 }
 
 bool LLPanelFace::selectedMediaEditable()
@@ -2378,7 +2378,7 @@ void LLPanelFace::updateMediaSettings()
 
     const LLMediaEntry default_media_data;
 
-    // controls 
+    // controls
     U8 value_u8 = default_media_data.getControls();
     struct functor_getter_controls : public LLSelectedTEGetFunctor< U8 >
     {
@@ -2867,58 +2867,58 @@ void LLPanelFace::updateMediaTitle()
 // static
 F32 LLPanelFace::valueGlow(LLViewerObject* object, S32 face)
 {
-	return (F32)(object->getTE(face)->getGlow());
+    return (F32)(object->getTE(face)->getGlow());
 }
 
 
 void LLPanelFace::onCommitColor(const LLSD& data)
 {
-	sendColor();
+    sendColor();
 }
 
 void LLPanelFace::onCommitShinyColor(const LLSD& data)
 {
-	LLSelectedTEMaterial::setSpecularLightColor(this, getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
+    LLSelectedTEMaterial::setSpecularLightColor(this, getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
 }
 
 void LLPanelFace::onCommitAlpha(const LLSD& data)
 {
-	sendAlpha();
+    sendAlpha();
 }
 
 void LLPanelFace::onCancelColor(const LLSD& data)
 {
-	LLSelectMgr::getInstance()->selectionRevertColors();
+    LLSelectMgr::getInstance()->selectionRevertColors();
 }
 
 void LLPanelFace::onCancelShinyColor(const LLSD& data)
 {
-	LLSelectMgr::getInstance()->selectionRevertShinyColors();
+    LLSelectMgr::getInstance()->selectionRevertShinyColors();
 }
 
 void LLPanelFace::onSelectColor(const LLSD& data)
 {
-	LLSelectMgr::getInstance()->saveSelectedObjectColors();
-	sendColor();
+    LLSelectMgr::getInstance()->saveSelectedObjectColors();
+    sendColor();
 }
 
 void LLPanelFace::onSelectShinyColor(const LLSD& data)
 {
-	LLSelectedTEMaterial::setSpecularLightColor(this, getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
-	LLSelectMgr::getInstance()->saveSelectedShinyColors();
+    LLSelectedTEMaterial::setSpecularLightColor(this, getChild<LLColorSwatchCtrl>("shinycolorswatch")->get());
+    LLSelectMgr::getInstance()->saveSelectedShinyColors();
 }
 
 // static
 void LLPanelFace::onCommitMaterialsMedia(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	// Force to default states to side-step problems with menu contents
-	// and generally reflecting old state when switching tabs or objects
-	//
-	self->updateShinyControls(false,true);
-	self->updateBumpyControls(false,true);
-	self->updateUI();
-	self->refreshMedia();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    // Force to default states to side-step problems with menu contents
+    // and generally reflecting old state when switching tabs or objects
+    //
+    self->updateShinyControls(false,true);
+    self->updateBumpyControls(false,true);
+    self->updateUI();
+    self->refreshMedia();
 }
 
 void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
@@ -2927,18 +2927,18 @@ void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
     LLRadioGroup* radio_pbr_type = findChild<LLRadioGroup>("radio_pbr_type");
     LLComboBox* combo_shininess = findChild<LLComboBox>("combobox shininess");
     LLComboBox* combo_bumpiness = findChild<LLComboBox>("combobox bumpiness");
-	if (!radio_mat_type || !radio_pbr_type || !mComboMatMedia || !combo_shininess || !combo_bumpiness)
-	{
-		LL_WARNS("Materials") << "Combo box not found...exiting." << LL_ENDL;
-		return;
-	}
-	U32 materials_media = mComboMatMedia->getCurrentIndex();
-	U32 material_type = radio_mat_type->getSelectedIndex();
-	bool show_media = (materials_media == MATMEDIA_MEDIA) && mComboMatMedia->getEnabled();
+    if (!radio_mat_type || !radio_pbr_type || !mComboMatMedia || !combo_shininess || !combo_bumpiness)
+    {
+        LL_WARNS("Materials") << "Combo box not found...exiting." << LL_ENDL;
+        return;
+    }
+    U32 materials_media = mComboMatMedia->getCurrentIndex();
+    U32 material_type = radio_mat_type->getSelectedIndex();
+    bool show_media = (materials_media == MATMEDIA_MEDIA) && mComboMatMedia->getEnabled();
     bool show_material = materials_media == MATMEDIA_MATERIAL;
-	bool show_texture = (show_media || (show_material && (material_type == MATTYPE_DIFFUSE) && mComboMatMedia->getEnabled()));
-	bool show_bumpiness = show_material && (material_type == MATTYPE_NORMAL) && mComboMatMedia->getEnabled();
-	bool show_shininess = show_material && (material_type == MATTYPE_SPECULAR) && mComboMatMedia->getEnabled();
+    bool show_texture = (show_media || (show_material && (material_type == MATTYPE_DIFFUSE) && mComboMatMedia->getEnabled()));
+    bool show_bumpiness = show_material && (material_type == MATTYPE_NORMAL) && mComboMatMedia->getEnabled();
+    bool show_shininess = show_material && (material_type == MATTYPE_SPECULAR) && mComboMatMedia->getEnabled();
     const bool show_pbr = mComboMatMedia->getCurrentIndex() == MATMEDIA_PBR && mComboMatMedia->getEnabled();
     const U32 pbr_type = findChild<LLRadioGroup>("radio_pbr_type")->getSelectedIndex();
     const LLGLTFMaterial::TextureInfo texture_info = texture_info_from_pbrtype(pbr_type);
@@ -2952,62 +2952,62 @@ void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
     getChildView("combobox texgen")->setVisible(show_material || show_media || show_pbr_asset);
     getChildView("button align textures")->setVisible(show_material || show_media);
 
-	// Media controls
+    // Media controls
     mTitleMediaText->setVisible(show_media);
-	getChildView("add_media")->setVisible(show_media);
-	getChildView("delete_media")->setVisible(show_media);
-	getChildView("button align")->setVisible(show_media);
-
-	// Diffuse texture controls
-	getChildView("texture control")->setVisible(show_texture && show_material);
-	getChildView("label alphamode")->setVisible(show_texture && show_material);
-	getChildView("combobox alphamode")->setVisible(show_texture && show_material);
-	getChildView("label maskcutoff")->setVisible(false);
-	getChildView("maskcutoff")->setVisible(false);
-	if (show_texture && show_material)
-	{
-		updateAlphaControls();
-	}
+    getChildView("add_media")->setVisible(show_media);
+    getChildView("delete_media")->setVisible(show_media);
+    getChildView("button align")->setVisible(show_media);
+
+    // Diffuse texture controls
+    getChildView("texture control")->setVisible(show_texture && show_material);
+    getChildView("label alphamode")->setVisible(show_texture && show_material);
+    getChildView("combobox alphamode")->setVisible(show_texture && show_material);
+    getChildView("label maskcutoff")->setVisible(false);
+    getChildView("maskcutoff")->setVisible(false);
+    if (show_texture && show_material)
+    {
+        updateAlphaControls();
+    }
     // texture scale and position controls
-	getChildView("TexScaleU")->setVisible(show_texture);
-	getChildView("TexScaleV")->setVisible(show_texture);
-	getChildView("TexRot")->setVisible(show_texture);
-	getChildView("TexOffsetU")->setVisible(show_texture);
-	getChildView("TexOffsetV")->setVisible(show_texture);
-
-	// Specular map controls
-	getChildView("shinytexture control")->setVisible(show_shininess);
-	getChildView("combobox shininess")->setVisible(show_shininess);
-	getChildView("label shininess")->setVisible(show_shininess);
-	getChildView("label glossiness")->setVisible(false);
-	getChildView("glossiness")->setVisible(false);
-	getChildView("label environment")->setVisible(false);
-	getChildView("environment")->setVisible(false);
-	getChildView("label shinycolor")->setVisible(false);
-	getChildView("shinycolorswatch")->setVisible(false);
-	if (show_shininess)
-	{
-		updateShinyControls();
-	}
-	getChildView("shinyScaleU")->setVisible(show_shininess);
-	getChildView("shinyScaleV")->setVisible(show_shininess);
-	getChildView("shinyRot")->setVisible(show_shininess);
-	getChildView("shinyOffsetU")->setVisible(show_shininess);
-	getChildView("shinyOffsetV")->setVisible(show_shininess);
-
-	// Normal map controls
-	if (show_bumpiness)
-	{
-		updateBumpyControls();
-	}
-	getChildView("bumpytexture control")->setVisible(show_bumpiness);
-	getChildView("combobox bumpiness")->setVisible(show_bumpiness);
-	getChildView("label bumpiness")->setVisible(show_bumpiness);
-	getChildView("bumpyScaleU")->setVisible(show_bumpiness);
-	getChildView("bumpyScaleV")->setVisible(show_bumpiness);
-	getChildView("bumpyRot")->setVisible(show_bumpiness);
-	getChildView("bumpyOffsetU")->setVisible(show_bumpiness);
-	getChildView("bumpyOffsetV")->setVisible(show_bumpiness);
+    getChildView("TexScaleU")->setVisible(show_texture);
+    getChildView("TexScaleV")->setVisible(show_texture);
+    getChildView("TexRot")->setVisible(show_texture);
+    getChildView("TexOffsetU")->setVisible(show_texture);
+    getChildView("TexOffsetV")->setVisible(show_texture);
+
+    // Specular map controls
+    getChildView("shinytexture control")->setVisible(show_shininess);
+    getChildView("combobox shininess")->setVisible(show_shininess);
+    getChildView("label shininess")->setVisible(show_shininess);
+    getChildView("label glossiness")->setVisible(false);
+    getChildView("glossiness")->setVisible(false);
+    getChildView("label environment")->setVisible(false);
+    getChildView("environment")->setVisible(false);
+    getChildView("label shinycolor")->setVisible(false);
+    getChildView("shinycolorswatch")->setVisible(false);
+    if (show_shininess)
+    {
+        updateShinyControls();
+    }
+    getChildView("shinyScaleU")->setVisible(show_shininess);
+    getChildView("shinyScaleV")->setVisible(show_shininess);
+    getChildView("shinyRot")->setVisible(show_shininess);
+    getChildView("shinyOffsetU")->setVisible(show_shininess);
+    getChildView("shinyOffsetV")->setVisible(show_shininess);
+
+    // Normal map controls
+    if (show_bumpiness)
+    {
+        updateBumpyControls();
+    }
+    getChildView("bumpytexture control")->setVisible(show_bumpiness);
+    getChildView("combobox bumpiness")->setVisible(show_bumpiness);
+    getChildView("label bumpiness")->setVisible(show_bumpiness);
+    getChildView("bumpyScaleU")->setVisible(show_bumpiness);
+    getChildView("bumpyScaleV")->setVisible(show_bumpiness);
+    getChildView("bumpyRot")->setVisible(show_bumpiness);
+    getChildView("bumpyOffsetU")->setVisible(show_bumpiness);
+    getChildView("bumpyOffsetV")->setVisible(show_bumpiness);
 
     getChild<LLSpinCtrl>("rptctrl")->setVisible(show_material || show_media);
 
@@ -3019,11 +3019,11 @@ void LLPanelFace::updateVisibility(LLViewerObject* objectp /* = nullptr */)
 void LLPanelFace::onCommitMaterialType(LLUICtrl* ctrl, void* userdata)
 {
     LLPanelFace* self = (LLPanelFace*) userdata;
-	 // Force to default states to side-step problems with menu contents
-	 // and generally reflecting old state when switching tabs or objects
-	 //
-	 self->updateShinyControls(false,true);
-	 self->updateBumpyControls(false,true);
+     // Force to default states to side-step problems with menu contents
+     // and generally reflecting old state when switching tabs or objects
+     //
+     self->updateShinyControls(false,true);
+     self->updateBumpyControls(false,true);
     self->updateUI();
 }
 
@@ -3040,149 +3040,149 @@ void LLPanelFace::onCommitPbrType(LLUICtrl* ctrl, void* userdata)
 // static
 void LLPanelFace::onCommitBump(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
+    LLPanelFace* self = (LLPanelFace*) userdata;
 
-	LLComboBox*	mComboBumpiness = self->getChild<LLComboBox>("combobox bumpiness");
-	if(!mComboBumpiness)
-		return;
+    LLComboBox* mComboBumpiness = self->getChild<LLComboBox>("combobox bumpiness");
+    if(!mComboBumpiness)
+        return;
 
-	U32 bumpiness = mComboBumpiness->getCurrentIndex();
+    U32 bumpiness = mComboBumpiness->getCurrentIndex();
 
-	self->sendBump(bumpiness);
+    self->sendBump(bumpiness);
 }
 
 // static
 void LLPanelFace::onCommitTexGen(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->sendTexGen();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->sendTexGen();
 }
 
 // static
 void LLPanelFace::updateShinyControls(bool is_setting_texture, bool mess_with_shiny_combobox)
 {
-	LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
-	LLUUID shiny_texture_ID = texture_ctrl->getImageAssetID();
-	LL_DEBUGS("Materials") << "Shiny texture selected: " << shiny_texture_ID << LL_ENDL;
-	LLComboBox* comboShiny = getChild<LLComboBox>("combobox shininess");
-
-	if(mess_with_shiny_combobox)
-	{
-		if (!comboShiny)
-		{
-			return;
-		}
-		if (!shiny_texture_ID.isNull() && is_setting_texture)
-		{
-			if (!comboShiny->itemExists(USE_TEXTURE))
-			{
-				comboShiny->add(USE_TEXTURE);
-			}
-			comboShiny->setSimple(USE_TEXTURE);
-		}
-		else
-		{
-			if (comboShiny->itemExists(USE_TEXTURE))
-			{
-				comboShiny->remove(SHINY_TEXTURE);
-				comboShiny->selectFirstItem();
-			}
-		}
-	}
-	else
-	{
-		if (shiny_texture_ID.isNull() && comboShiny && comboShiny->itemExists(USE_TEXTURE))
-		{
-			comboShiny->remove(SHINY_TEXTURE);
-			comboShiny->selectFirstItem();
-		}
-	}
-
-
-	LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
-	U32 materials_media = mComboMatMedia->getCurrentIndex();
-	U32 material_type = radio_mat_type->getSelectedIndex();
-	bool show_material = (materials_media == MATMEDIA_MATERIAL);
-	bool show_shininess = show_material && (material_type == MATTYPE_SPECULAR) && mComboMatMedia->getEnabled();
-	U32 shiny_value = comboShiny->getCurrentIndex();
-	bool show_shinyctrls = (shiny_value == SHINY_TEXTURE) && show_shininess; // Use texture
-	getChildView("label glossiness")->setVisible(show_shinyctrls);
-	getChildView("glossiness")->setVisible(show_shinyctrls);
-	getChildView("label environment")->setVisible(show_shinyctrls);
-	getChildView("environment")->setVisible(show_shinyctrls);
-	getChildView("label shinycolor")->setVisible(show_shinyctrls);
-	getChildView("shinycolorswatch")->setVisible(show_shinyctrls);
+    LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("shinytexture control");
+    LLUUID shiny_texture_ID = texture_ctrl->getImageAssetID();
+    LL_DEBUGS("Materials") << "Shiny texture selected: " << shiny_texture_ID << LL_ENDL;
+    LLComboBox* comboShiny = getChild<LLComboBox>("combobox shininess");
+
+    if(mess_with_shiny_combobox)
+    {
+        if (!comboShiny)
+        {
+            return;
+        }
+        if (!shiny_texture_ID.isNull() && is_setting_texture)
+        {
+            if (!comboShiny->itemExists(USE_TEXTURE))
+            {
+                comboShiny->add(USE_TEXTURE);
+            }
+            comboShiny->setSimple(USE_TEXTURE);
+        }
+        else
+        {
+            if (comboShiny->itemExists(USE_TEXTURE))
+            {
+                comboShiny->remove(SHINY_TEXTURE);
+                comboShiny->selectFirstItem();
+            }
+        }
+    }
+    else
+    {
+        if (shiny_texture_ID.isNull() && comboShiny && comboShiny->itemExists(USE_TEXTURE))
+        {
+            comboShiny->remove(SHINY_TEXTURE);
+            comboShiny->selectFirstItem();
+        }
+    }
+
+
+    LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
+    U32 materials_media = mComboMatMedia->getCurrentIndex();
+    U32 material_type = radio_mat_type->getSelectedIndex();
+    bool show_material = (materials_media == MATMEDIA_MATERIAL);
+    bool show_shininess = show_material && (material_type == MATTYPE_SPECULAR) && mComboMatMedia->getEnabled();
+    U32 shiny_value = comboShiny->getCurrentIndex();
+    bool show_shinyctrls = (shiny_value == SHINY_TEXTURE) && show_shininess; // Use texture
+    getChildView("label glossiness")->setVisible(show_shinyctrls);
+    getChildView("glossiness")->setVisible(show_shinyctrls);
+    getChildView("label environment")->setVisible(show_shinyctrls);
+    getChildView("environment")->setVisible(show_shinyctrls);
+    getChildView("label shinycolor")->setVisible(show_shinyctrls);
+    getChildView("shinycolorswatch")->setVisible(show_shinyctrls);
 }
 
 // static
 void LLPanelFace::updateBumpyControls(bool is_setting_texture, bool mess_with_combobox)
 {
-	LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
-	LLUUID bumpy_texture_ID = texture_ctrl->getImageAssetID();
-	LL_DEBUGS("Materials") << "texture: " << bumpy_texture_ID << (mess_with_combobox ? "" : " do not") << " update combobox" << LL_ENDL;
-	LLComboBox* comboBumpy = getChild<LLComboBox>("combobox bumpiness");
-	if (!comboBumpy)
-	{
-		return;
-	}
-
-	if (mess_with_combobox)
-	{
-		LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
-		LLUUID bumpy_texture_ID = texture_ctrl->getImageAssetID();
-		LL_DEBUGS("Materials") << "texture: " << bumpy_texture_ID << (mess_with_combobox ? "" : " do not") << " update combobox" << LL_ENDL;
-
-		if (!bumpy_texture_ID.isNull() && is_setting_texture)
-		{
-			if (!comboBumpy->itemExists(USE_TEXTURE))
-			{
-				comboBumpy->add(USE_TEXTURE);
-			}
-			comboBumpy->setSimple(USE_TEXTURE);
-		}
-		else
-		{
-			if (comboBumpy->itemExists(USE_TEXTURE))
-			{
-				comboBumpy->remove(BUMPY_TEXTURE);
-				comboBumpy->selectFirstItem();
-			}
-		}
-	}
+    LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
+    LLUUID bumpy_texture_ID = texture_ctrl->getImageAssetID();
+    LL_DEBUGS("Materials") << "texture: " << bumpy_texture_ID << (mess_with_combobox ? "" : " do not") << " update combobox" << LL_ENDL;
+    LLComboBox* comboBumpy = getChild<LLComboBox>("combobox bumpiness");
+    if (!comboBumpy)
+    {
+        return;
+    }
+
+    if (mess_with_combobox)
+    {
+        LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>("bumpytexture control");
+        LLUUID bumpy_texture_ID = texture_ctrl->getImageAssetID();
+        LL_DEBUGS("Materials") << "texture: " << bumpy_texture_ID << (mess_with_combobox ? "" : " do not") << " update combobox" << LL_ENDL;
+
+        if (!bumpy_texture_ID.isNull() && is_setting_texture)
+        {
+            if (!comboBumpy->itemExists(USE_TEXTURE))
+            {
+                comboBumpy->add(USE_TEXTURE);
+            }
+            comboBumpy->setSimple(USE_TEXTURE);
+        }
+        else
+        {
+            if (comboBumpy->itemExists(USE_TEXTURE))
+            {
+                comboBumpy->remove(BUMPY_TEXTURE);
+                comboBumpy->selectFirstItem();
+            }
+        }
+    }
 }
 
 // static
 void LLPanelFace::onCommitShiny(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
+    LLPanelFace* self = (LLPanelFace*) userdata;
 
 
-	LLComboBox*	mComboShininess = self->getChild<LLComboBox>("combobox shininess");
-	if(!mComboShininess)
-		return;
-	
-	U32 shininess = mComboShininess->getCurrentIndex();
+    LLComboBox* mComboShininess = self->getChild<LLComboBox>("combobox shininess");
+    if(!mComboShininess)
+        return;
+
+    U32 shininess = mComboShininess->getCurrentIndex();
 
-	self->sendShiny(shininess);
+    self->sendShiny(shininess);
 }
 
 // static
 void LLPanelFace::updateAlphaControls()
 {
-	LLComboBox* comboAlphaMode = getChild<LLComboBox>("combobox alphamode");
-	if (!comboAlphaMode)
-	{
-		return;
-	}
-	U32 alpha_value = comboAlphaMode->getCurrentIndex();
-	bool show_alphactrls = (alpha_value == ALPHAMODE_MASK); // Alpha masking
-    
+    LLComboBox* comboAlphaMode = getChild<LLComboBox>("combobox alphamode");
+    if (!comboAlphaMode)
+    {
+        return;
+    }
+    U32 alpha_value = comboAlphaMode->getCurrentIndex();
+    bool show_alphactrls = (alpha_value == ALPHAMODE_MASK); // Alpha masking
+
     U32 mat_media = MATMEDIA_MATERIAL;
     if (mComboMatMedia)
     {
         mat_media = mComboMatMedia->getCurrentIndex();
     }
-    
+
     U32 mat_type = MATTYPE_DIFFUSE;
     LLRadioGroup* radio_mat_type = getChild<LLRadioGroup>("radio_material_type");
     if(radio_mat_type)
@@ -3192,31 +3192,31 @@ void LLPanelFace::updateAlphaControls()
 
     show_alphactrls = show_alphactrls && (mat_media == MATMEDIA_MATERIAL);
     show_alphactrls = show_alphactrls && (mat_type == MATTYPE_DIFFUSE);
-    
-	getChildView("label maskcutoff")->setVisible(show_alphactrls);
-	getChildView("maskcutoff")->setVisible(show_alphactrls);
+
+    getChildView("label maskcutoff")->setVisible(show_alphactrls);
+    getChildView("maskcutoff")->setVisible(show_alphactrls);
 }
 
 // static
 void LLPanelFace::onCommitAlphaMode(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->updateAlphaControls();
-	LLSelectedTEMaterial::setDiffuseAlphaMode(self,self->getCurrentDiffuseAlphaMode());
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->updateAlphaControls();
+    LLSelectedTEMaterial::setDiffuseAlphaMode(self,self->getCurrentDiffuseAlphaMode());
 }
 
 // static
 void LLPanelFace::onCommitFullbright(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->sendFullbright();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->sendFullbright();
 }
 
 // static
 void LLPanelFace::onCommitGlow(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->sendGlow();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->sendGlow();
 }
 
 // static
@@ -3305,102 +3305,102 @@ BOOL LLPanelFace::onDragTexture(LLUICtrl*, LLInventoryItem* item)
 
 void LLPanelFace::onCommitTexture( const LLSD& data )
 {
-	add(LLStatViewer::EDIT_TEXTURE, 1);
-	sendTexture();
+    add(LLStatViewer::EDIT_TEXTURE, 1);
+    sendTexture();
 }
 
 void LLPanelFace::onCancelTexture(const LLSD& data)
 {
-	LLSelectMgr::getInstance()->selectionRevertTextures();
+    LLSelectMgr::getInstance()->selectionRevertTextures();
 }
 
 void LLPanelFace::onSelectTexture(const LLSD& data)
 {
-	LLSelectMgr::getInstance()->saveSelectedObjectTextures();
-	sendTexture();
-
-	LLGLenum image_format;
-	bool identical_image_format = false;
-	LLSelectedTE::getImageFormat(image_format, identical_image_format);
-    
-	LLCtrlSelectionInterface* combobox_alphamode =
-		childGetSelectionInterface("combobox alphamode");
-
-	U32 alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-	if (combobox_alphamode)
-	{
-		switch (image_format)
-		{
-		case GL_RGBA:
-		case GL_ALPHA:
-			{
-				alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_BLEND;
-			}
-			break;
-
-		case GL_RGB: break;
-		default:
-			{
-				LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
-			}
-			break;
-		}
-
-		combobox_alphamode->selectNthItem(alpha_mode);
-	}
-	LLSelectedTEMaterial::setDiffuseAlphaMode(this, getCurrentDiffuseAlphaMode());
+    LLSelectMgr::getInstance()->saveSelectedObjectTextures();
+    sendTexture();
+
+    LLGLenum image_format;
+    bool identical_image_format = false;
+    LLSelectedTE::getImageFormat(image_format, identical_image_format);
+
+    LLCtrlSelectionInterface* combobox_alphamode =
+        childGetSelectionInterface("combobox alphamode");
+
+    U32 alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+    if (combobox_alphamode)
+    {
+        switch (image_format)
+        {
+        case GL_RGBA:
+        case GL_ALPHA:
+            {
+                alpha_mode = LLMaterial::DIFFUSE_ALPHA_MODE_BLEND;
+            }
+            break;
+
+        case GL_RGB: break;
+        default:
+            {
+                LL_WARNS() << "Unexpected tex format in LLPanelFace...resorting to no alpha" << LL_ENDL;
+            }
+            break;
+        }
+
+        combobox_alphamode->selectNthItem(alpha_mode);
+    }
+    LLSelectedTEMaterial::setDiffuseAlphaMode(this, getCurrentDiffuseAlphaMode());
 }
 
 void LLPanelFace::onCloseTexturePicker(const LLSD& data)
 {
-	LL_DEBUGS("Materials") << data << LL_ENDL;
-	updateUI();
+    LL_DEBUGS("Materials") << data << LL_ENDL;
+    updateUI();
 }
 
 void LLPanelFace::onCommitSpecularTexture( const LLSD& data )
 {
-	LL_DEBUGS("Materials") << data << LL_ENDL;
-	sendShiny(SHINY_TEXTURE);
+    LL_DEBUGS("Materials") << data << LL_ENDL;
+    sendShiny(SHINY_TEXTURE);
 }
 
 void LLPanelFace::onCommitNormalTexture( const LLSD& data )
 {
-	LL_DEBUGS("Materials") << data << LL_ENDL;
-	LLUUID nmap_id = getCurrentNormalMap();
-	sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
+    LL_DEBUGS("Materials") << data << LL_ENDL;
+    LLUUID nmap_id = getCurrentNormalMap();
+    sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
 }
 
 void LLPanelFace::onCancelSpecularTexture(const LLSD& data)
 {
-	U8 shiny = 0;
-	bool identical_shiny = false;
-	LLSelectedTE::getShiny(shiny, identical_shiny);
-	LLUUID spec_map_id = getChild<LLTextureCtrl>("shinytexture control")->getImageAssetID();
-	shiny = spec_map_id.isNull() ? shiny : SHINY_TEXTURE;
-	sendShiny(shiny);
+    U8 shiny = 0;
+    bool identical_shiny = false;
+    LLSelectedTE::getShiny(shiny, identical_shiny);
+    LLUUID spec_map_id = getChild<LLTextureCtrl>("shinytexture control")->getImageAssetID();
+    shiny = spec_map_id.isNull() ? shiny : SHINY_TEXTURE;
+    sendShiny(shiny);
 }
 
 void LLPanelFace::onCancelNormalTexture(const LLSD& data)
 {
-	U8 bumpy = 0;
-	bool identical_bumpy = false;
-	LLSelectedTE::getBumpmap(bumpy, identical_bumpy);
-	LLUUID spec_map_id = getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();
-	bumpy = spec_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
-	sendBump(bumpy);
+    U8 bumpy = 0;
+    bool identical_bumpy = false;
+    LLSelectedTE::getBumpmap(bumpy, identical_bumpy);
+    LLUUID spec_map_id = getChild<LLTextureCtrl>("bumpytexture control")->getImageAssetID();
+    bumpy = spec_map_id.isNull() ? bumpy : BUMPY_TEXTURE;
+    sendBump(bumpy);
 }
 
 void LLPanelFace::onSelectSpecularTexture(const LLSD& data)
 {
-	LL_DEBUGS("Materials") << data << LL_ENDL;
-	sendShiny(SHINY_TEXTURE);
+    LL_DEBUGS("Materials") << data << LL_ENDL;
+    sendShiny(SHINY_TEXTURE);
 }
 
 void LLPanelFace::onSelectNormalTexture(const LLSD& data)
 {
-	LL_DEBUGS("Materials") << data << LL_ENDL;
-	LLUUID nmap_id = getCurrentNormalMap();
-	sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
+    LL_DEBUGS("Materials") << data << LL_ENDL;
+    LLUUID nmap_id = getCurrentNormalMap();
+    sendBump(nmap_id.isNull() ? 0 : BUMPY_TEXTURE);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -3477,212 +3477,212 @@ bool LLPanelFace::multipleFacesSelectedConfirm(const LLSD& notification, const L
 //static
 void LLPanelFace::syncOffsetX(LLPanelFace* self, F32 offsetU)
 {
-	LLSelectedTEMaterial::setNormalOffsetX(self,offsetU);
-	LLSelectedTEMaterial::setSpecularOffsetX(self,offsetU);
-	self->getChild<LLSpinCtrl>("TexOffsetU")->forceSetValue(offsetU);
-	self->sendTextureInfo();
+    LLSelectedTEMaterial::setNormalOffsetX(self,offsetU);
+    LLSelectedTEMaterial::setSpecularOffsetX(self,offsetU);
+    self->getChild<LLSpinCtrl>("TexOffsetU")->forceSetValue(offsetU);
+    self->sendTextureInfo();
 }
 
 //static
 void LLPanelFace::syncOffsetY(LLPanelFace* self, F32 offsetV)
 {
-	LLSelectedTEMaterial::setNormalOffsetY(self,offsetV);
-	LLSelectedTEMaterial::setSpecularOffsetY(self,offsetV);
-	self->getChild<LLSpinCtrl>("TexOffsetV")->forceSetValue(offsetV);
-	self->sendTextureInfo();
+    LLSelectedTEMaterial::setNormalOffsetY(self,offsetV);
+    LLSelectedTEMaterial::setSpecularOffsetY(self,offsetV);
+    self->getChild<LLSpinCtrl>("TexOffsetV")->forceSetValue(offsetV);
+    self->sendTextureInfo();
 }
 
 //static
 void LLPanelFace::onCommitMaterialBumpyOffsetX(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetX(self,self->getCurrentBumpyOffsetU());
-	}
-	else
-	{
-		LLSelectedTEMaterial::setNormalOffsetX(self,self->getCurrentBumpyOffsetU());
-	}
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetX(self,self->getCurrentBumpyOffsetU());
+    }
+    else
+    {
+        LLSelectedTEMaterial::setNormalOffsetX(self,self->getCurrentBumpyOffsetU());
+    }
 
 }
 
 //static
 void LLPanelFace::onCommitMaterialBumpyOffsetY(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetY(self,self->getCurrentBumpyOffsetV());
-	}
-	else
-	{
-		LLSelectedTEMaterial::setNormalOffsetY(self,self->getCurrentBumpyOffsetV());
-	}
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetY(self,self->getCurrentBumpyOffsetV());
+    }
+    else
+    {
+        LLSelectedTEMaterial::setNormalOffsetY(self,self->getCurrentBumpyOffsetV());
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialShinyOffsetX(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetX(self, self->getCurrentShinyOffsetU());
-	}
-	else
-	{
-		LLSelectedTEMaterial::setSpecularOffsetX(self,self->getCurrentShinyOffsetU());
-	}
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetX(self, self->getCurrentShinyOffsetU());
+    }
+    else
+    {
+        LLSelectedTEMaterial::setSpecularOffsetX(self,self->getCurrentShinyOffsetU());
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialShinyOffsetY(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetY(self,self->getCurrentShinyOffsetV());
-	}
-	else
-	{
-		LLSelectedTEMaterial::setSpecularOffsetY(self,self->getCurrentShinyOffsetV());
-	}
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetY(self,self->getCurrentShinyOffsetV());
+    }
+    else
+    {
+        LLSelectedTEMaterial::setSpecularOffsetY(self,self->getCurrentShinyOffsetV());
+    }
 }
 
 //static
 void LLPanelFace::syncRepeatX(LLPanelFace* self, F32 scaleU)
 {
-	LLSelectedTEMaterial::setNormalRepeatX(self,scaleU);
-	LLSelectedTEMaterial::setSpecularRepeatX(self,scaleU);
-	self->sendTextureInfo();
+    LLSelectedTEMaterial::setNormalRepeatX(self,scaleU);
+    LLSelectedTEMaterial::setSpecularRepeatX(self,scaleU);
+    self->sendTextureInfo();
 }
 
 //static
 void LLPanelFace::syncRepeatY(LLPanelFace* self, F32 scaleV)
 {
-	LLSelectedTEMaterial::setNormalRepeatY(self,scaleV);
-	LLSelectedTEMaterial::setSpecularRepeatY(self,scaleV);
-	self->sendTextureInfo();
+    LLSelectedTEMaterial::setNormalRepeatY(self,scaleV);
+    LLSelectedTEMaterial::setSpecularRepeatY(self,scaleV);
+    self->sendTextureInfo();
 }
 
 //static
 void LLPanelFace::onCommitMaterialBumpyScaleX(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	F32 bumpy_scale_u = self->getCurrentBumpyScaleU();
-	if (self->isIdenticalPlanarTexgen())
-	{
-		bumpy_scale_u *= 0.5f;
-	}
-
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexScaleU")->forceSetValue(self->getCurrentBumpyScaleU());
-		syncRepeatX(self, bumpy_scale_u);
-	}
-	else
-	{
-		LLSelectedTEMaterial::setNormalRepeatX(self,bumpy_scale_u);
-	}
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    F32 bumpy_scale_u = self->getCurrentBumpyScaleU();
+    if (self->isIdenticalPlanarTexgen())
+    {
+        bumpy_scale_u *= 0.5f;
+    }
+
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexScaleU")->forceSetValue(self->getCurrentBumpyScaleU());
+        syncRepeatX(self, bumpy_scale_u);
+    }
+    else
+    {
+        LLSelectedTEMaterial::setNormalRepeatX(self,bumpy_scale_u);
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialBumpyScaleY(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	F32 bumpy_scale_v = self->getCurrentBumpyScaleV();
-	if (self->isIdenticalPlanarTexgen())
-	{
-		bumpy_scale_v *= 0.5f;
-	}
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    F32 bumpy_scale_v = self->getCurrentBumpyScaleV();
+    if (self->isIdenticalPlanarTexgen())
+    {
+        bumpy_scale_v *= 0.5f;
+    }
 
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(self->getCurrentBumpyScaleV());
-		syncRepeatY(self, bumpy_scale_v);
-	}
-	else
-	{
-		LLSelectedTEMaterial::setNormalRepeatY(self,bumpy_scale_v);
-	}
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(self->getCurrentBumpyScaleV());
+        syncRepeatY(self, bumpy_scale_v);
+    }
+    else
+    {
+        LLSelectedTEMaterial::setNormalRepeatY(self,bumpy_scale_v);
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialShinyScaleX(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	F32 shiny_scale_u = self->getCurrentShinyScaleU();
-	if (self->isIdenticalPlanarTexgen())
-	{
-		shiny_scale_u *= 0.5f;
-	}
-
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexScaleU")->forceSetValue(self->getCurrentShinyScaleU());
-		syncRepeatX(self, shiny_scale_u);
-	}
-	else
-	{
-		LLSelectedTEMaterial::setSpecularRepeatX(self,shiny_scale_u);
-	}
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    F32 shiny_scale_u = self->getCurrentShinyScaleU();
+    if (self->isIdenticalPlanarTexgen())
+    {
+        shiny_scale_u *= 0.5f;
+    }
+
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexScaleU")->forceSetValue(self->getCurrentShinyScaleU());
+        syncRepeatX(self, shiny_scale_u);
+    }
+    else
+    {
+        LLSelectedTEMaterial::setSpecularRepeatX(self,shiny_scale_u);
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialShinyScaleY(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	F32 shiny_scale_v = self->getCurrentShinyScaleV();
-	if (self->isIdenticalPlanarTexgen())
-	{
-		shiny_scale_v *= 0.5f;
-	}
-
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(self->getCurrentShinyScaleV());
-		syncRepeatY(self, shiny_scale_v);
-	}
-	else
-	{
-		LLSelectedTEMaterial::setSpecularRepeatY(self,shiny_scale_v);
-	}
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    F32 shiny_scale_v = self->getCurrentShinyScaleV();
+    if (self->isIdenticalPlanarTexgen())
+    {
+        shiny_scale_v *= 0.5f;
+    }
+
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexScaleV")->forceSetValue(self->getCurrentShinyScaleV());
+        syncRepeatY(self, shiny_scale_v);
+    }
+    else
+    {
+        LLSelectedTEMaterial::setSpecularRepeatY(self,shiny_scale_v);
+    }
 }
 
 //static
 void LLPanelFace::syncMaterialRot(LLPanelFace* self, F32 rot, int te)
 {
-	LLSelectedTEMaterial::setNormalRotation(self,rot * DEG_TO_RAD, te);
-	LLSelectedTEMaterial::setSpecularRotation(self,rot * DEG_TO_RAD, te);
-	self->sendTextureInfo();
+    LLSelectedTEMaterial::setNormalRotation(self,rot * DEG_TO_RAD, te);
+    LLSelectedTEMaterial::setSpecularRotation(self,rot * DEG_TO_RAD, te);
+    self->sendTextureInfo();
 }
 
 //static
 void LLPanelFace::onCommitMaterialBumpyRot(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexRot")->forceSetValue(self->getCurrentBumpyRot());
-		syncMaterialRot(self, self->getCurrentBumpyRot());
-	}
-	else
-	{
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexRot")->forceSetValue(self->getCurrentBumpyRot());
+        syncMaterialRot(self, self->getCurrentBumpyRot());
+    }
+    else
+    {
         if ((bool)self->childGetValue("checkbox planar align").asBoolean())
         {
             LLFace* last_face = NULL;
@@ -3695,22 +3695,22 @@ void LLPanelFace::onCommitMaterialBumpyRot(LLUICtrl* ctrl, void* userdata)
         {
             LLSelectedTEMaterial::setNormalRotation(self, self->getCurrentBumpyRot() * DEG_TO_RAD);
         }
-	}
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialShinyRot(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		self->getChild<LLSpinCtrl>("TexRot")->forceSetValue(self->getCurrentShinyRot());
-		syncMaterialRot(self, self->getCurrentShinyRot());
-	}
-	else
-	{
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        self->getChild<LLSpinCtrl>("TexRot")->forceSetValue(self->getCurrentShinyRot());
+        syncMaterialRot(self, self->getCurrentShinyRot());
+    }
+    else
+    {
         if ((bool)self->childGetValue("checkbox planar align").asBoolean())
         {
             LLFace* last_face = NULL;
@@ -3723,136 +3723,136 @@ void LLPanelFace::onCommitMaterialShinyRot(LLUICtrl* ctrl, void* userdata)
         {
             LLSelectedTEMaterial::setSpecularRotation(self, self->getCurrentShinyRot() * DEG_TO_RAD);
         }
-	}
+    }
 }
 
 //static
 void LLPanelFace::onCommitMaterialGloss(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	LLSelectedTEMaterial::setSpecularLightExponent(self,self->getCurrentGlossiness());
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    LLSelectedTEMaterial::setSpecularLightExponent(self,self->getCurrentGlossiness());
 }
 
 //static
 void LLPanelFace::onCommitMaterialEnv(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	llassert_always(self);
-	LLSelectedTEMaterial::setEnvironmentIntensity(self,self->getCurrentEnvIntensity());
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    llassert_always(self);
+    LLSelectedTEMaterial::setEnvironmentIntensity(self,self->getCurrentEnvIntensity());
 }
 
 //static
 void LLPanelFace::onCommitMaterialMaskCutoff(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	LLSelectedTEMaterial::setAlphaMaskCutoff(self,self->getCurrentAlphaMaskCutoff());
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    LLSelectedTEMaterial::setAlphaMaskCutoff(self,self->getCurrentAlphaMaskCutoff());
 }
 
 // static
 void LLPanelFace::onCommitTextureInfo( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->sendTextureInfo();
-	// vertical scale and repeats per meter depends on each other, so force set on changes
-	self->updateUI(true);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->sendTextureInfo();
+    // vertical scale and repeats per meter depends on each other, so force set on changes
+    self->updateUI(true);
 }
 
 // static
 void LLPanelFace::onCommitTextureScaleX( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		F32 bumpy_scale_u = self->getChild<LLUICtrl>("TexScaleU")->getValue().asReal();
-		if (self->isIdenticalPlanarTexgen())
-		{
-			bumpy_scale_u *= 0.5f;
-		}
-		syncRepeatX(self, bumpy_scale_u);
-	}
-	else
-	{
-		self->sendTextureInfo();
-	}
-	self->updateUI(true);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        F32 bumpy_scale_u = self->getChild<LLUICtrl>("TexScaleU")->getValue().asReal();
+        if (self->isIdenticalPlanarTexgen())
+        {
+            bumpy_scale_u *= 0.5f;
+        }
+        syncRepeatX(self, bumpy_scale_u);
+    }
+    else
+    {
+        self->sendTextureInfo();
+    }
+    self->updateUI(true);
 }
 
 // static
 void LLPanelFace::onCommitTextureScaleY( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		F32 bumpy_scale_v = self->getChild<LLUICtrl>("TexScaleV")->getValue().asReal();
-		if (self->isIdenticalPlanarTexgen())
-		{
-			bumpy_scale_v *= 0.5f;
-		}
-		syncRepeatY(self, bumpy_scale_v);
-	}
-	else
-	{
-		self->sendTextureInfo();
-	}
-	self->updateUI(true);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        F32 bumpy_scale_v = self->getChild<LLUICtrl>("TexScaleV")->getValue().asReal();
+        if (self->isIdenticalPlanarTexgen())
+        {
+            bumpy_scale_v *= 0.5f;
+        }
+        syncRepeatY(self, bumpy_scale_v);
+    }
+    else
+    {
+        self->sendTextureInfo();
+    }
+    self->updateUI(true);
 }
 
 // static
 void LLPanelFace::onCommitTextureRot( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
+    LLPanelFace* self = (LLPanelFace*) userdata;
 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncMaterialRot(self, self->getChild<LLUICtrl>("TexRot")->getValue().asReal());
-	}
-	else
-	{
-		self->sendTextureInfo();
-	}
-	self->updateUI(true);
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncMaterialRot(self, self->getChild<LLUICtrl>("TexRot")->getValue().asReal());
+    }
+    else
+    {
+        self->sendTextureInfo();
+    }
+    self->updateUI(true);
 }
 
 // static
 void LLPanelFace::onCommitTextureOffsetX( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetX(self, self->getChild<LLUICtrl>("TexOffsetU")->getValue().asReal());
-	}
-	else
-	{
-		self->sendTextureInfo();
-	}
-	self->updateUI(true);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetX(self, self->getChild<LLUICtrl>("TexOffsetU")->getValue().asReal());
+    }
+    else
+    {
+        self->sendTextureInfo();
+    }
+    self->updateUI(true);
 }
 
 // static
 void LLPanelFace::onCommitTextureOffsetY( LLUICtrl* ctrl, void* userdata )
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		syncOffsetY(self, self->getChild<LLUICtrl>("TexOffsetV")->getValue().asReal());
-	}
-	else
-	{
-		self->sendTextureInfo();
-	}
-	self->updateUI(true);
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        syncOffsetY(self, self->getChild<LLUICtrl>("TexOffsetV")->getValue().asReal());
+    }
+    else
+    {
+        self->sendTextureInfo();
+    }
+    self->updateUI(true);
 }
 
 // Commit the number of repeats per meter
 // static
 void LLPanelFace::onCommitRepeatsPerMeter(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	
-	LLUICtrl*	repeats_ctrl	= self->getChild<LLUICtrl>("rptctrl");
-	
-	U32 materials_media = self->mComboMatMedia->getCurrentIndex();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+
+    LLUICtrl*   repeats_ctrl    = self->getChild<LLUICtrl>("rptctrl");
+
+    U32 materials_media = self->mComboMatMedia->getCurrentIndex();
     U32 material_type = 0;
     if (materials_media == MATMEDIA_PBR)
     {
@@ -3865,126 +3865,126 @@ void LLPanelFace::onCommitRepeatsPerMeter(LLUICtrl* ctrl, void* userdata)
         material_type = radio_mat_type->getSelectedIndex();
     }
 
-	F32 repeats_per_meter	= repeats_ctrl->getValue().asReal();
-	
+    F32 repeats_per_meter   = repeats_ctrl->getValue().asReal();
+
    F32 obj_scale_s = 1.0f;
    F32 obj_scale_t = 1.0f;
 
-	bool identical_scale_s = false;
-	bool identical_scale_t = false;
-
-	LLSelectedTE::getObjectScaleS(obj_scale_s, identical_scale_s);
-	LLSelectedTE::getObjectScaleS(obj_scale_t, identical_scale_t);
-
-	LLUICtrl* bumpy_scale_u = self->getChild<LLUICtrl>("bumpyScaleU");
-	LLUICtrl* bumpy_scale_v = self->getChild<LLUICtrl>("bumpyScaleV");
-	LLUICtrl* shiny_scale_u = self->getChild<LLUICtrl>("shinyScaleU");
-	LLUICtrl* shiny_scale_v = self->getChild<LLUICtrl>("shinyScaleV");
- 
-	if (gSavedSettings.getBOOL("SyncMaterialSettings"))
-	{
-		LLSelectMgr::getInstance()->selectionTexScaleAutofit( repeats_per_meter );
-
-		bumpy_scale_u->setValue(obj_scale_s * repeats_per_meter);
-		bumpy_scale_v->setValue(obj_scale_t * repeats_per_meter);
-
-		LLSelectedTEMaterial::setNormalRepeatX(self,obj_scale_s * repeats_per_meter);
-		LLSelectedTEMaterial::setNormalRepeatY(self,obj_scale_t * repeats_per_meter);
-
-		shiny_scale_u->setValue(obj_scale_s * repeats_per_meter);
-		shiny_scale_v->setValue(obj_scale_t * repeats_per_meter);
-
-		LLSelectedTEMaterial::setSpecularRepeatX(self,obj_scale_s * repeats_per_meter);
-		LLSelectedTEMaterial::setSpecularRepeatY(self,obj_scale_t * repeats_per_meter);
-	}
-	else
-	{
-		switch (material_type)
-		{
-			case MATTYPE_DIFFUSE:
-			{
-				LLSelectMgr::getInstance()->selectionTexScaleAutofit( repeats_per_meter );
-			}
-			break;
-
-			case MATTYPE_NORMAL:
-			{
-				bumpy_scale_u->setValue(obj_scale_s * repeats_per_meter);
-				bumpy_scale_v->setValue(obj_scale_t * repeats_per_meter);
-
-				LLSelectedTEMaterial::setNormalRepeatX(self,obj_scale_s * repeats_per_meter);
-				LLSelectedTEMaterial::setNormalRepeatY(self,obj_scale_t * repeats_per_meter);
-			}
-			break;
-
-			case MATTYPE_SPECULAR:
-			{
-				shiny_scale_u->setValue(obj_scale_s * repeats_per_meter);
-				shiny_scale_v->setValue(obj_scale_t * repeats_per_meter);
-
-				LLSelectedTEMaterial::setSpecularRepeatX(self,obj_scale_s * repeats_per_meter);
-				LLSelectedTEMaterial::setSpecularRepeatY(self,obj_scale_t * repeats_per_meter);
-			}
-			break;
-
-			default:
-				llassert(false);
-				break;
-		}
-	}
-	// vertical scale and repeats per meter depends on each other, so force set on changes
-	self->updateUI(true);
+    bool identical_scale_s = false;
+    bool identical_scale_t = false;
+
+    LLSelectedTE::getObjectScaleS(obj_scale_s, identical_scale_s);
+    LLSelectedTE::getObjectScaleS(obj_scale_t, identical_scale_t);
+
+    LLUICtrl* bumpy_scale_u = self->getChild<LLUICtrl>("bumpyScaleU");
+    LLUICtrl* bumpy_scale_v = self->getChild<LLUICtrl>("bumpyScaleV");
+    LLUICtrl* shiny_scale_u = self->getChild<LLUICtrl>("shinyScaleU");
+    LLUICtrl* shiny_scale_v = self->getChild<LLUICtrl>("shinyScaleV");
+
+    if (gSavedSettings.getBOOL("SyncMaterialSettings"))
+    {
+        LLSelectMgr::getInstance()->selectionTexScaleAutofit( repeats_per_meter );
+
+        bumpy_scale_u->setValue(obj_scale_s * repeats_per_meter);
+        bumpy_scale_v->setValue(obj_scale_t * repeats_per_meter);
+
+        LLSelectedTEMaterial::setNormalRepeatX(self,obj_scale_s * repeats_per_meter);
+        LLSelectedTEMaterial::setNormalRepeatY(self,obj_scale_t * repeats_per_meter);
+
+        shiny_scale_u->setValue(obj_scale_s * repeats_per_meter);
+        shiny_scale_v->setValue(obj_scale_t * repeats_per_meter);
+
+        LLSelectedTEMaterial::setSpecularRepeatX(self,obj_scale_s * repeats_per_meter);
+        LLSelectedTEMaterial::setSpecularRepeatY(self,obj_scale_t * repeats_per_meter);
+    }
+    else
+    {
+        switch (material_type)
+        {
+            case MATTYPE_DIFFUSE:
+            {
+                LLSelectMgr::getInstance()->selectionTexScaleAutofit( repeats_per_meter );
+            }
+            break;
+
+            case MATTYPE_NORMAL:
+            {
+                bumpy_scale_u->setValue(obj_scale_s * repeats_per_meter);
+                bumpy_scale_v->setValue(obj_scale_t * repeats_per_meter);
+
+                LLSelectedTEMaterial::setNormalRepeatX(self,obj_scale_s * repeats_per_meter);
+                LLSelectedTEMaterial::setNormalRepeatY(self,obj_scale_t * repeats_per_meter);
+            }
+            break;
+
+            case MATTYPE_SPECULAR:
+            {
+                shiny_scale_u->setValue(obj_scale_s * repeats_per_meter);
+                shiny_scale_v->setValue(obj_scale_t * repeats_per_meter);
+
+                LLSelectedTEMaterial::setSpecularRepeatX(self,obj_scale_s * repeats_per_meter);
+                LLSelectedTEMaterial::setSpecularRepeatY(self,obj_scale_t * repeats_per_meter);
+            }
+            break;
+
+            default:
+                llassert(false);
+                break;
+        }
+    }
+    // vertical scale and repeats per meter depends on each other, so force set on changes
+    self->updateUI(true);
 }
 
 struct LLPanelFaceSetMediaFunctor : public LLSelectedTEFunctor
 {
-	virtual bool apply(LLViewerObject* object, S32 te)
-	{
-		viewer_media_t pMediaImpl;
-				
-		const LLTextureEntry* tep = object->getTE(te);
-		const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL;
-		if ( mep )
-		{
-			pMediaImpl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(mep->getMediaID());
-		}
-		
-		if ( pMediaImpl.isNull())
-		{
-			// If we didn't find face media for this face, check whether this face is showing parcel media.
-			pMediaImpl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(tep->getID());
-		}
-		
-		if ( pMediaImpl.notNull())
-		{
-			LLPluginClassMedia *media = pMediaImpl->getMediaPlugin();
-			if(media)
-			{
-				S32 media_width = media->getWidth();
-				S32 media_height = media->getHeight();
-				S32 texture_width = media->getTextureWidth();
-				S32 texture_height = media->getTextureHeight();
-				F32 scale_s = (F32)media_width / (F32)texture_width;
-				F32 scale_t = (F32)media_height / (F32)texture_height;
-
-				// set scale and adjust offset
-				object->setTEScaleS( te, scale_s );
-				object->setTEScaleT( te, scale_t );	// don't need to flip Y anymore since QT does this for us now.
-				object->setTEOffsetS( te, -( 1.0f - scale_s ) / 2.0f );
-				object->setTEOffsetT( te, -( 1.0f - scale_t ) / 2.0f );
-			}
-		}
-		return true;
-	};
+    virtual bool apply(LLViewerObject* object, S32 te)
+    {
+        viewer_media_t pMediaImpl;
+
+        const LLTextureEntry* tep = object->getTE(te);
+        const LLMediaEntry* mep = tep->hasMedia() ? tep->getMediaData() : NULL;
+        if ( mep )
+        {
+            pMediaImpl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(mep->getMediaID());
+        }
+
+        if ( pMediaImpl.isNull())
+        {
+            // If we didn't find face media for this face, check whether this face is showing parcel media.
+            pMediaImpl = LLViewerMedia::getInstance()->getMediaImplFromTextureID(tep->getID());
+        }
+
+        if ( pMediaImpl.notNull())
+        {
+            LLPluginClassMedia *media = pMediaImpl->getMediaPlugin();
+            if(media)
+            {
+                S32 media_width = media->getWidth();
+                S32 media_height = media->getHeight();
+                S32 texture_width = media->getTextureWidth();
+                S32 texture_height = media->getTextureHeight();
+                F32 scale_s = (F32)media_width / (F32)texture_width;
+                F32 scale_t = (F32)media_height / (F32)texture_height;
+
+                // set scale and adjust offset
+                object->setTEScaleS( te, scale_s );
+                object->setTEScaleT( te, scale_t ); // don't need to flip Y anymore since QT does this for us now.
+                object->setTEOffsetS( te, -( 1.0f - scale_s ) / 2.0f );
+                object->setTEOffsetT( te, -( 1.0f - scale_t ) / 2.0f );
+            }
+        }
+        return true;
+    };
 };
 
 void LLPanelFace::onClickAutoFix(void* userdata)
 {
-	LLPanelFaceSetMediaFunctor setfunc;
-	LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
+    LLPanelFaceSetMediaFunctor setfunc;
+    LLSelectMgr::getInstance()->getSelection()->applyToTEs(&setfunc);
 
-	LLPanelFaceSendFunctor sendfunc;
-	LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
+    LLPanelFaceSendFunctor sendfunc;
+    LLSelectMgr::getInstance()->getSelection()->applyToObjects(&sendfunc);
 }
 
 void LLPanelFace::onAlignTexture(void* userdata)
@@ -4361,7 +4361,7 @@ void LLPanelFace::onCopyTexture()
 
                     {
                         te_data["te"]["itemfullperm"] = full_perm;
-                        te_data["te"]["fromlibrary"] = from_library; 
+                        te_data["te"]["fromlibrary"] = from_library;
 
                         // If full permission object, texture is free to copy,
                         // but otherwise we need to check inventory and extract permissions
@@ -4489,7 +4489,7 @@ void LLPanelFace::onPasteTexture()
     }
 
     // we can copy if single face was copied in edit face mode or if face count matches
-    if (!((clipboard.size() == 1) && mClipboardParams["texture_all_tes"].asBoolean()) 
+    if (!((clipboard.size() == 1) && mClipboardParams["texture_all_tes"].asBoolean())
         && compare_tes != clipboard.size())
     {
         LLSD notif_args;
@@ -4871,9 +4871,9 @@ bool LLPanelFace::menuEnableItem(const LLSD& userdata)
 // static
 void LLPanelFace::onCommitPlanarAlign(LLUICtrl* ctrl, void* userdata)
 {
-	LLPanelFace* self = (LLPanelFace*) userdata;
-	self->getState();
-	self->sendTextureInfo();
+    LLPanelFace* self = (LLPanelFace*) userdata;
+    self->getState();
+    self->sendTextureInfo();
 }
 
 void LLPanelFace::updateGLTFTextureTransform(float value, U32 pbr_type, std::function<void(LLGLTFMaterial::TextureTransform*)> edit)
@@ -5122,54 +5122,54 @@ void LLPanelFace::onCommitGLTFTextureOffsetV(LLUICtrl* ctrl)
 
 void LLPanelFace::onTextureSelectionChanged(LLInventoryItem* itemp)
 {
-	LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL;
-	LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
-	if(!radio_mat_type)
-	{
-	    return;
-	}
-	U32 mattype = radio_mat_type->getSelectedIndex();
-	std::string which_control="texture control";
-	switch (mattype)
-	{
-		case MATTYPE_SPECULAR:
-			which_control = "shinytexture control";
-			break;
-		case MATTYPE_NORMAL:
-			which_control = "bumpytexture control";
-			break;
-		// no default needed
-	}
-	LL_DEBUGS("Materials") << "control " << which_control << LL_ENDL;
-	LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(which_control);
-	if (texture_ctrl)
-	{
-		LLUUID obj_owner_id;
-		std::string obj_owner_name;
-		LLSelectMgr::instance().selectGetOwner(obj_owner_id, obj_owner_name);
-
-		LLSaleInfo sale_info;
-		LLSelectMgr::instance().selectGetSaleInfo(sale_info);
-
-		bool can_copy = itemp->getPermissions().allowCopyBy(gAgentID); // do we have perm to copy this texture?
-		bool can_transfer = itemp->getPermissions().allowOperationBy(PERM_TRANSFER, gAgentID); // do we have perm to transfer this texture?
-		bool is_object_owner = gAgentID == obj_owner_id; // does object for which we are going to apply texture belong to the agent?
-		bool not_for_sale = !sale_info.isForSale(); // is object for which we are going to apply texture not for sale?
-
-		if (can_copy && can_transfer)
-		{
-			texture_ctrl->setCanApply(true, true);
-			return;
-		}
-
-		// if texture has (no-transfer) attribute it can be applied only for object which we own and is not for sale
-		texture_ctrl->setCanApply(false, can_transfer ? true : is_object_owner && not_for_sale);
-
-		if (gSavedSettings.getBOOL("TextureLivePreview"))
-		{
-			LLNotificationsUtil::add("LivePreviewUnavailable");
-		}
-	}
+    LL_DEBUGS("Materials") << "item asset " << itemp->getAssetUUID() << LL_ENDL;
+    LLRadioGroup* radio_mat_type = findChild<LLRadioGroup>("radio_material_type");
+    if(!radio_mat_type)
+    {
+        return;
+    }
+    U32 mattype = radio_mat_type->getSelectedIndex();
+    std::string which_control="texture control";
+    switch (mattype)
+    {
+        case MATTYPE_SPECULAR:
+            which_control = "shinytexture control";
+            break;
+        case MATTYPE_NORMAL:
+            which_control = "bumpytexture control";
+            break;
+        // no default needed
+    }
+    LL_DEBUGS("Materials") << "control " << which_control << LL_ENDL;
+    LLTextureCtrl* texture_ctrl = getChild<LLTextureCtrl>(which_control);
+    if (texture_ctrl)
+    {
+        LLUUID obj_owner_id;
+        std::string obj_owner_name;
+        LLSelectMgr::instance().selectGetOwner(obj_owner_id, obj_owner_name);
+
+        LLSaleInfo sale_info;
+        LLSelectMgr::instance().selectGetSaleInfo(sale_info);
+
+        bool can_copy = itemp->getPermissions().allowCopyBy(gAgentID); // do we have perm to copy this texture?
+        bool can_transfer = itemp->getPermissions().allowOperationBy(PERM_TRANSFER, gAgentID); // do we have perm to transfer this texture?
+        bool is_object_owner = gAgentID == obj_owner_id; // does object for which we are going to apply texture belong to the agent?
+        bool not_for_sale = !sale_info.isForSale(); // is object for which we are going to apply texture not for sale?
+
+        if (can_copy && can_transfer)
+        {
+            texture_ctrl->setCanApply(true, true);
+            return;
+        }
+
+        // if texture has (no-transfer) attribute it can be applied only for object which we own and is not for sale
+        texture_ctrl->setCanApply(false, can_transfer ? true : is_object_owner && not_for_sale);
+
+        if (gSavedSettings.getBOOL("TextureLivePreview"))
+        {
+            LLNotificationsUtil::add("LivePreviewUnavailable");
+        }
+    }
 }
 
 void LLPanelFace::onPbrSelectionChanged(LLInventoryItem* itemp)
@@ -5209,81 +5209,81 @@ void LLPanelFace::onPbrSelectionChanged(LLInventoryItem* itemp)
 
 bool LLPanelFace::isIdenticalPlanarTexgen()
 {
-	LLTextureEntry::e_texgen selected_texgen = LLTextureEntry::TEX_GEN_DEFAULT;
-	bool identical_texgen = false;
-	LLSelectedTE::getTexGen(selected_texgen, identical_texgen);
-	return (identical_texgen && (selected_texgen == LLTextureEntry::TEX_GEN_PLANAR));
+    LLTextureEntry::e_texgen selected_texgen = LLTextureEntry::TEX_GEN_DEFAULT;
+    bool identical_texgen = false;
+    LLSelectedTE::getTexGen(selected_texgen, identical_texgen);
+    return (identical_texgen && (selected_texgen == LLTextureEntry::TEX_GEN_PLANAR));
 }
 
 void LLPanelFace::LLSelectedTE::getFace(LLFace*& face_to_return, bool& identical_face)
-{		
-	struct LLSelectedTEGetFace : public LLSelectedTEGetFunctor<LLFace *>
-	{
-		LLFace* get(LLViewerObject* object, S32 te)
-		{
-			return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
-		}
-	} get_te_face_func;
-	identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_te_face_func, face_to_return, false, (LLFace*)nullptr);
+{
+    struct LLSelectedTEGetFace : public LLSelectedTEGetFunctor<LLFace *>
+    {
+        LLFace* get(LLViewerObject* object, S32 te)
+        {
+            return (object->mDrawable) ? object->mDrawable->getFace(te): NULL;
+        }
+    } get_te_face_func;
+    identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_te_face_func, face_to_return, false, (LLFace*)nullptr);
 }
 
 void LLPanelFace::LLSelectedTE::getImageFormat(LLGLenum& image_format_to_return, bool& identical_face)
 {
-	LLGLenum image_format{};
-	struct LLSelectedTEGetImageFormat : public LLSelectedTEGetFunctor<LLGLenum>
-	{
-		LLGLenum get(LLViewerObject* object, S32 te_index)
-		{
-			LLViewerTexture* image = object->getTEImage(te_index);
-			return image ? image->getPrimaryFormat() : GL_RGB;
-		}
-	} get_glenum;
-	identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_glenum, image_format);
-	image_format_to_return = image_format;
+    LLGLenum image_format{};
+    struct LLSelectedTEGetImageFormat : public LLSelectedTEGetFunctor<LLGLenum>
+    {
+        LLGLenum get(LLViewerObject* object, S32 te_index)
+        {
+            LLViewerTexture* image = object->getTEImage(te_index);
+            return image ? image->getPrimaryFormat() : GL_RGB;
+        }
+    } get_glenum;
+    identical_face = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue(&get_glenum, image_format);
+    image_format_to_return = image_format;
 }
 
 void LLPanelFace::LLSelectedTE::getTexId(LLUUID& id, bool& identical)
-{		
-	struct LLSelectedTEGetTexId : public LLSelectedTEGetFunctor<LLUUID>
-	{
-		LLUUID get(LLViewerObject* object, S32 te_index)
-		{
-			LLTextureEntry *te = object->getTE(te_index);
-			if (te)
-			{
-				if ((te->getID() == IMG_USE_BAKED_EYES) || (te->getID() == IMG_USE_BAKED_HAIR) || (te->getID() == IMG_USE_BAKED_HEAD) || (te->getID() == IMG_USE_BAKED_LOWER) || (te->getID() == IMG_USE_BAKED_SKIRT) || (te->getID() == IMG_USE_BAKED_UPPER)
-					|| (te->getID() == IMG_USE_BAKED_LEFTARM) || (te->getID() == IMG_USE_BAKED_LEFTLEG) || (te->getID() == IMG_USE_BAKED_AUX1) || (te->getID() == IMG_USE_BAKED_AUX2) || (te->getID() == IMG_USE_BAKED_AUX3))
-				{
-					return te->getID();
-				}
-			}
-
-			LLUUID id;
-			LLViewerTexture* image = object->getTEImage(te_index);
-			if (image)
-			{
-				id = image->getID();
-			}
-
-			if (!id.isNull() && LLViewerMedia::getInstance()->textureHasMedia(id))
-			{
-				if (te)
-				{
-					LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL;
-					if(!tex)
-					{
-						tex = LLViewerFetchedTexture::sDefaultImagep;
-					}
-					if (tex)
-					{
-						id = tex->getID();
-					}
-				}
-			}
-			return id;
-		}
-	} func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, id );
+{
+    struct LLSelectedTEGetTexId : public LLSelectedTEGetFunctor<LLUUID>
+    {
+        LLUUID get(LLViewerObject* object, S32 te_index)
+        {
+            LLTextureEntry *te = object->getTE(te_index);
+            if (te)
+            {
+                if ((te->getID() == IMG_USE_BAKED_EYES) || (te->getID() == IMG_USE_BAKED_HAIR) || (te->getID() == IMG_USE_BAKED_HEAD) || (te->getID() == IMG_USE_BAKED_LOWER) || (te->getID() == IMG_USE_BAKED_SKIRT) || (te->getID() == IMG_USE_BAKED_UPPER)
+                    || (te->getID() == IMG_USE_BAKED_LEFTARM) || (te->getID() == IMG_USE_BAKED_LEFTLEG) || (te->getID() == IMG_USE_BAKED_AUX1) || (te->getID() == IMG_USE_BAKED_AUX2) || (te->getID() == IMG_USE_BAKED_AUX3))
+                {
+                    return te->getID();
+                }
+            }
+
+            LLUUID id;
+            LLViewerTexture* image = object->getTEImage(te_index);
+            if (image)
+            {
+                id = image->getID();
+            }
+
+            if (!id.isNull() && LLViewerMedia::getInstance()->textureHasMedia(id))
+            {
+                if (te)
+                {
+                    LLViewerTexture* tex = te->getID().notNull() ? gTextureList.findImage(te->getID(), TEX_LIST_STANDARD) : NULL;
+                    if(!tex)
+                    {
+                        tex = LLViewerFetchedTexture::sDefaultImagep;
+                    }
+                    if (tex)
+                    {
+                        id = tex->getID();
+                    }
+                }
+            }
+            return id;
+        }
+    } func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, id );
 }
 
 void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bool& has_faces_with_pbr, bool& has_faces_without_pbr)
@@ -5316,7 +5316,7 @@ void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bo
                 {
                     mIdenticalId = false;
                 }
-                
+
                 LLGLTFMaterial* te_override = object->getTE(te_index)->getGLTFMaterialOverride();
                 if (te_override)
                 {
@@ -5359,139 +5359,139 @@ void LLPanelFace::LLSelectedTE::getPbrMaterialId(LLUUID& id, bool& identical, bo
 
 void LLPanelFace::LLSelectedTEMaterial::getCurrent(LLMaterialPtr& material_ptr, bool& identical_material)
 {
-	struct MaterialFunctor : public LLSelectedTEGetFunctor<LLMaterialPtr>
-	{
-		LLMaterialPtr get(LLViewerObject* object, S32 te_index)
-		{
-			return object->getTE(te_index)->getMaterialParams();
-		}
-	} func;
-	identical_material = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, material_ptr);
+    struct MaterialFunctor : public LLSelectedTEGetFunctor<LLMaterialPtr>
+    {
+        LLMaterialPtr get(LLViewerObject* object, S32 te_index)
+        {
+            return object->getTE(te_index)->getMaterialParams();
+        }
+    } func;
+    identical_material = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &func, material_ptr);
 }
 
 void LLPanelFace::LLSelectedTEMaterial::getMaxSpecularRepeats(F32& repeats, bool& identical)
 {
-	struct LLSelectedTEGetMaxSpecRepeats : public LLSelectedTEGetFunctor<F32>
-	{
-		F32 get(LLViewerObject* object, S32 face)
-		{
-			LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
-			U32 s_axis = VX;
-			U32 t_axis = VY;
-			F32 repeats_s = 1.0f;
-			F32 repeats_t = 1.0f;
-			if (mat)
-			{
-				mat->getSpecularRepeat(repeats_s, repeats_t);
-				repeats_s /= object->getScale().mV[s_axis];
-				repeats_t /= object->getScale().mV[t_axis];
-			}					
-			return llmax(repeats_s, repeats_t);
-		}
-
-	} max_spec_repeats_func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_spec_repeats_func, repeats);
+    struct LLSelectedTEGetMaxSpecRepeats : public LLSelectedTEGetFunctor<F32>
+    {
+        F32 get(LLViewerObject* object, S32 face)
+        {
+            LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
+            U32 s_axis = VX;
+            U32 t_axis = VY;
+            F32 repeats_s = 1.0f;
+            F32 repeats_t = 1.0f;
+            if (mat)
+            {
+                mat->getSpecularRepeat(repeats_s, repeats_t);
+                repeats_s /= object->getScale().mV[s_axis];
+                repeats_t /= object->getScale().mV[t_axis];
+            }
+            return llmax(repeats_s, repeats_t);
+        }
+
+    } max_spec_repeats_func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_spec_repeats_func, repeats);
 }
 
 void LLPanelFace::LLSelectedTEMaterial::getMaxNormalRepeats(F32& repeats, bool& identical)
 {
-	struct LLSelectedTEGetMaxNormRepeats : public LLSelectedTEGetFunctor<F32>
-	{
-		F32 get(LLViewerObject* object, S32 face)
-		{
-			LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
-			U32 s_axis = VX;
-			U32 t_axis = VY;
-			F32 repeats_s = 1.0f;
-			F32 repeats_t = 1.0f;
-			if (mat)
-			{
-				mat->getNormalRepeat(repeats_s, repeats_t);
-				repeats_s /= object->getScale().mV[s_axis];
-				repeats_t /= object->getScale().mV[t_axis];
-			}					
-			return llmax(repeats_s, repeats_t);
-		}
-
-	} max_norm_repeats_func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_norm_repeats_func, repeats);
+    struct LLSelectedTEGetMaxNormRepeats : public LLSelectedTEGetFunctor<F32>
+    {
+        F32 get(LLViewerObject* object, S32 face)
+        {
+            LLMaterial* mat = object->getTE(face)->getMaterialParams().get();
+            U32 s_axis = VX;
+            U32 t_axis = VY;
+            F32 repeats_s = 1.0f;
+            F32 repeats_t = 1.0f;
+            if (mat)
+            {
+                mat->getNormalRepeat(repeats_s, repeats_t);
+                repeats_s /= object->getScale().mV[s_axis];
+                repeats_t /= object->getScale().mV[t_axis];
+            }
+            return llmax(repeats_s, repeats_t);
+        }
+
+    } max_norm_repeats_func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_norm_repeats_func, repeats);
 }
 
 void LLPanelFace::LLSelectedTEMaterial::getCurrentDiffuseAlphaMode(U8& diffuse_alpha_mode, bool& identical, bool diffuse_texture_has_alpha)
 {
-	struct LLSelectedTEGetDiffuseAlphaMode : public LLSelectedTEGetFunctor<U8>
-	{
-		LLSelectedTEGetDiffuseAlphaMode() : _isAlpha(false) {}
-		LLSelectedTEGetDiffuseAlphaMode(bool diffuse_texture_has_alpha) : _isAlpha(diffuse_texture_has_alpha) {}
-		virtual ~LLSelectedTEGetDiffuseAlphaMode() {}
-
-		U8 get(LLViewerObject* object, S32 face)
-		{
-			U8 diffuse_mode = _isAlpha ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
-
-			LLTextureEntry* tep = object->getTE(face);
-			if (tep)
-			{
-				LLMaterial* mat = tep->getMaterialParams().get();
-				if (mat)
-				{
-					diffuse_mode = mat->getDiffuseAlphaMode();
-				}
-			}
-			
-			return diffuse_mode;
-		}
-		bool _isAlpha; // whether or not the diffuse texture selected contains alpha information
-	} get_diff_mode(diffuse_texture_has_alpha);
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &get_diff_mode, diffuse_alpha_mode);
+    struct LLSelectedTEGetDiffuseAlphaMode : public LLSelectedTEGetFunctor<U8>
+    {
+        LLSelectedTEGetDiffuseAlphaMode() : _isAlpha(false) {}
+        LLSelectedTEGetDiffuseAlphaMode(bool diffuse_texture_has_alpha) : _isAlpha(diffuse_texture_has_alpha) {}
+        virtual ~LLSelectedTEGetDiffuseAlphaMode() {}
+
+        U8 get(LLViewerObject* object, S32 face)
+        {
+            U8 diffuse_mode = _isAlpha ? LLMaterial::DIFFUSE_ALPHA_MODE_BLEND : LLMaterial::DIFFUSE_ALPHA_MODE_NONE;
+
+            LLTextureEntry* tep = object->getTE(face);
+            if (tep)
+            {
+                LLMaterial* mat = tep->getMaterialParams().get();
+                if (mat)
+                {
+                    diffuse_mode = mat->getDiffuseAlphaMode();
+                }
+            }
+
+            return diffuse_mode;
+        }
+        bool _isAlpha; // whether or not the diffuse texture selected contains alpha information
+    } get_diff_mode(diffuse_texture_has_alpha);
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &get_diff_mode, diffuse_alpha_mode);
 }
 
 void LLPanelFace::LLSelectedTE::getObjectScaleS(F32& scale_s, bool& identical)
-{	
-	struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32>
-	{
-		F32 get(LLViewerObject* object, S32 face)
-		{
-			U32 s_axis = VX;
-			U32 t_axis = VY;
-			LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
-			return object->getScale().mV[s_axis];
-		}
+{
+    struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32>
+    {
+        F32 get(LLViewerObject* object, S32 face)
+        {
+            U32 s_axis = VX;
+            U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
+            return object->getScale().mV[s_axis];
+        }
 
-	} scale_s_func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &scale_s_func, scale_s );
+    } scale_s_func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &scale_s_func, scale_s );
 }
 
 void LLPanelFace::LLSelectedTE::getObjectScaleT(F32& scale_t, bool& identical)
-{	
-	struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32>
-	{
-		F32 get(LLViewerObject* object, S32 face)
-		{
-			U32 s_axis = VX;
-			U32 t_axis = VY;
-			LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
-			return object->getScale().mV[t_axis];
-		}
+{
+    struct LLSelectedTEGetObjectScaleS : public LLSelectedTEGetFunctor<F32>
+    {
+        F32 get(LLViewerObject* object, S32 face)
+        {
+            U32 s_axis = VX;
+            U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
+            return object->getScale().mV[t_axis];
+        }
 
-	} scale_t_func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &scale_t_func, scale_t );
+    } scale_t_func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &scale_t_func, scale_t );
 }
 
 void LLPanelFace::LLSelectedTE::getMaxDiffuseRepeats(F32& repeats, bool& identical)
 {
-	struct LLSelectedTEGetMaxDiffuseRepeats : public LLSelectedTEGetFunctor<F32>
-	{
-		F32 get(LLViewerObject* object, S32 face)
-		{
-			U32 s_axis = VX;
-			U32 t_axis = VY;
-			LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
-			F32 repeats_s = object->getTE(face)->mScaleS / object->getScale().mV[s_axis];
-			F32 repeats_t = object->getTE(face)->mScaleT / object->getScale().mV[t_axis];
-			return llmax(repeats_s, repeats_t);
-		}
-
-	} max_diff_repeats_func;
-	identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_diff_repeats_func, repeats );
+    struct LLSelectedTEGetMaxDiffuseRepeats : public LLSelectedTEGetFunctor<F32>
+    {
+        F32 get(LLViewerObject* object, S32 face)
+        {
+            U32 s_axis = VX;
+            U32 t_axis = VY;
+            LLPrimitive::getTESTAxes(face, &s_axis, &t_axis);
+            F32 repeats_s = object->getTE(face)->mScaleS / object->getScale().mV[s_axis];
+            F32 repeats_t = object->getTE(face)->mScaleT / object->getScale().mV[t_axis];
+            return llmax(repeats_s, repeats_t);
+        }
+
+    } max_diff_repeats_func;
+    identical = LLSelectMgr::getInstance()->getSelection()->getSelectedTEValue( &max_diff_repeats_func, repeats );
 }