diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-05-13 17:06:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-13 17:06:17 +0300 |
| commit | 9013267da2269a9bd9683862b7449db1b1093afc (patch) | |
| tree | 336172dfd6468e8bafa1d9c4a229624e85ffecfb /indra/newview/llfloaterscriptedprefs.cpp | |
| parent | 0cb2c511bc2a0f54eb7b3a4c2988d7ebec96e3be (diff) | |
| parent | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (diff) | |
Merge pull request #1373 from secondlife/marchcat/x-ws-merge
Diffstat (limited to 'indra/newview/llfloaterscriptedprefs.cpp')
| -rw-r--r-- | indra/newview/llfloaterscriptedprefs.cpp | 32 |
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())); } |