diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:44:45 +0200 |
| commit | 4dd3d230ec7a43845f1a72dfcc7152ab04550d8e (patch) | |
| tree | 2f6f9feefa9bdd7dd6ee4595bf65ad1af038047e /indra/newview/llhints.h | |
| parent | b1ceef6ea4abffdfb36844c3b8e469283edce229 (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llhints.h')
| -rw-r--r-- | indra/newview/llhints.h | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/indra/newview/llhints.h b/indra/newview/llhints.h index dd6195a9ce..1f730734d0 100644 --- a/indra/newview/llhints.h +++ b/indra/newview/llhints.h @@ -32,19 +32,22 @@ #include "llinitdestroyclass.h" -class LLHints : public LLInitClass<LLHints> +class LLHints : public LLSingleton<LLHints> { + LLSINGLETON(LLHints); + ~LLHints(); public: - static void show(LLNotificationPtr hint); - static void hide(LLNotificationPtr hint); - static void registerHintTarget(const std::string& name, LLHandle<LLView> target); - static LLHandle<LLView> getHintTarget(const std::string& name); - static void initClass(); + void show(LLNotificationPtr hint); + void hide(LLNotificationPtr hint); + void registerHintTarget(const std::string& name, LLHandle<LLView> target); + LLHandle<LLView> getHintTarget(const std::string& name); private: - static LLRegistry<std::string, LLHandle<LLView> > sTargetRegistry; + LLRegistry<std::string, LLHandle<LLView> > mTargetRegistry; typedef std::map<LLNotificationPtr, class LLHintPopup*> hint_map_t; - static hint_map_t sHints; - static void showHints(const LLSD& show); + hint_map_t mHints; + void showHints(const LLSD& show); + + boost::signals2::connection mControlConnection; }; |