diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-05-23 11:31:19 -0700 |
| commit | a1f49564d670a2c41bfa25c833bba2564b9b7f48 (patch) | |
| tree | 1d205e51bc37621916a17d459ad83782fe41f975 /indra/newview/llfloaterscriptedprefs.h | |
| parent | 6af5db09faf5ea33a2d4c47b64e76f42edae178a (diff) | |
| parent | 6377610f6587989c126b00f490dfc8d527a1c2ce (diff) | |
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into brad/merge-maint-a-to-dev
Diffstat (limited to 'indra/newview/llfloaterscriptedprefs.h')
| -rw-r--r-- | indra/newview/llfloaterscriptedprefs.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/indra/newview/llfloaterscriptedprefs.h b/indra/newview/llfloaterscriptedprefs.h index f6a9027bfa..6654832a6d 100644 --- a/indra/newview/llfloaterscriptedprefs.h +++ b/indra/newview/llfloaterscriptedprefs.h @@ -36,16 +36,16 @@ class LLUICtrl; class LLFloaterScriptEdPrefs : public LLFloater { public: - LLFloaterScriptEdPrefs(const LLSD& key); - bool postBuild() override; - + LLFloaterScriptEdPrefs(const LLSD& key); + bool postBuild() override; + private: - ~LLFloaterScriptEdPrefs() {}; - - void applyUIColor(LLUICtrl* ctrl, const LLSD& param); - void getUIColor(LLUICtrl* ctrl, const LLSD& param); - - LLScriptEditor* mEditor; + ~LLFloaterScriptEdPrefs() {}; + + void applyUIColor(LLUICtrl* ctrl, const LLSD& param); + void getUIColor(LLUICtrl* ctrl, const LLSD& param); + + LLScriptEditor* mEditor; }; #endif // LL_FLOATERSCRIPTEDPREFS_H |