diff options
| author | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
|---|---|---|
| committer | Nat Goodspeed <nat@lindenlab.com> | 2024-05-14 21:02:28 -0400 |
| commit | 094dcc07f8c1d90ae723dbe60eddacb90a09eae8 (patch) | |
| tree | e750942e5f22ed677b543bd49509c2a7cdc5ce56 /indra/newview/llfloaterscriptedprefs.cpp | |
| parent | d4043d3b011c32eb503c43c551872f9c24d7344f (diff) | |
| parent | 38c2a5bde985a6a8a96d912d432f8bdf7e5b60be (diff) | |
Merge DRTVWR-591-maint-X to main on promotion of secondlife/viewer #705: Maintenance X
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())); } |