Merge main into inventory_favorites

# Conflicts:
#	indra/llui/llfolderviewmodel.h
#	indra/newview/llpanelwearing.cpp
#	indra/newview/llwearableitemslist.cpp

1 files changed, 16 insertions, 16 deletions

diff --git a/indra/newview/llfloaterscriptedprefs.cpp b/indra/newview/llfloaterscriptedprefs.cpp
index 2484a08626..89c5d3617c 100644
--- a/indra/newview/llfloaterscriptedprefs.cpp
+++ b/indra/newview/llfloaterscriptedprefs.cpp
@@ -33,33 +33,33 @@
 
 
 LLFloaterScriptEdPrefs::LLFloaterScriptEdPrefs(const LLSD& key)
-:	LLFloater(key)
-,	mEditor(NULL)
+:   LLFloater(key)
+,   mEditor(NULL)
 {
-	mCommitCallbackRegistrar.add("ScriptPref.applyUIColor",	boost::bind(&LLFloaterScriptEdPrefs::applyUIColor, this ,_1, _2));
-	mCommitCallbackRegistrar.add("ScriptPref.getUIColor",	boost::bind(&LLFloaterScriptEdPrefs::getUIColor, this ,_1, _2));
+    mCommitCallbackRegistrar.add("ScriptPref.applyUIColor", boost::bind(&LLFloaterScriptEdPrefs::applyUIColor, this ,_1, _2));
+    mCommitCallbackRegistrar.add("ScriptPref.getUIColor",   boost::bind(&LLFloaterScriptEdPrefs::getUIColor, this ,_1, _2));
 }
 
 BOOL LLFloaterScriptEdPrefs::postBuild()
 {
-	mEditor = getChild<LLScriptEditor>("Script Preview");
-	if (mEditor)
-	{
-		mEditor->initKeywords();
-		mEditor->loadKeywords();
-	}
-	return TRUE;
+    mEditor = getChild<LLScriptEditor>("Script Preview");
+    if (mEditor)
+    {
+        mEditor->initKeywords();
+        mEditor->loadKeywords();
+    }
+    return TRUE;
 }
 
 void LLFloaterScriptEdPrefs::applyUIColor(LLUICtrl* ctrl, const LLSD& param)
 {
-	LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
-	mEditor->initKeywords();
-	mEditor->loadKeywords();
+    LLUIColorTable::instance().setColor(param.asString(), LLColor4(ctrl->getValue()));
+    mEditor->initKeywords();
+    mEditor->loadKeywords();
 }
 
 void LLFloaterScriptEdPrefs::getUIColor(LLUICtrl* ctrl, const LLSD& param)
 {
-	LLColorSwatchCtrl* color_swatch = dynamic_cast<LLColorSwatchCtrl*>(ctrl);
-	color_swatch->setOriginal(LLUIColorTable::instance().getColor(param.asString()));
+    LLColorSwatchCtrl* color_swatch = dynamic_cast<LLColorSwatchCtrl*>(ctrl);
+    color_swatch->setOriginal(LLUIColorTable::instance().getColor(param.asString()));
 }