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/lltoastscriptquestion.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/lltoastscriptquestion.h')
| -rw-r--r-- | indra/newview/lltoastscriptquestion.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/indra/newview/lltoastscriptquestion.h b/indra/newview/lltoastscriptquestion.h index a756f88415..fc129236db 100644 --- a/indra/newview/lltoastscriptquestion.h +++ b/indra/newview/lltoastscriptquestion.h @@ -32,20 +32,20 @@ class LLToastScriptQuestion : public LLToastPanel { - LOG_CLASS(LLToastScriptQuestion); + LOG_CLASS(LLToastScriptQuestion); public: - LLToastScriptQuestion(const LLNotificationPtr& notification); - virtual BOOL postBuild(); - virtual ~LLToastScriptQuestion(){}; + LLToastScriptQuestion(const LLNotificationPtr& notification); + virtual BOOL postBuild(); + virtual ~LLToastScriptQuestion(){}; - /*virtual*/ void setFocus(BOOL b); + /*virtual*/ void setFocus(BOOL b); private: - void snapToMessageHeight(); + void snapToMessageHeight(); - void createButtons(); - void onButtonClicked(std::string btn_name); + void createButtons(); + void onButtonClicked(std::string btn_name); }; #endif /* LLTOASTSCRIPTQUESTION_H_ */ |