diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 17:06:06 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-06-10 19:25:02 +0300 |
| commit | 0dcc912cecdfb365c1f4246545ece40ccb7bc18e (patch) | |
| tree | ccf664c765d1adbbf4985069321df65c85ca36e2 /indra/newview/llfloaterscriptedprefs.h | |
| parent | bd8438f7083643ae5812b14e35e69e69ef1616c6 (diff) | |
| parent | d317454c82e016a02c8a708a0118f3ff29aa8e82 (diff) | |
Merge main into inventory_favorites
# Conflicts:
# indra/llui/llfolderviewmodel.h
# indra/newview/llpanelwearing.cpp
# indra/newview/llwearableitemslist.cpp
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 31df897aac..135c5bb6c7 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(); - + LLFloaterScriptEdPrefs(const LLSD& key); + BOOL postBuild(); + 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 |