diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2012-01-18 21:04:19 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2012-01-18 21:04:19 +0200 |
| commit | 41a43a4125a69835e6a76f5792a267ba0797f41a (patch) | |
| tree | 0d121cf3a7632a590091e306c5301b189468490e /indra/newview/llnotificationmanager.h | |
| parent | 2b724e30cf49999f4a4def3d197d739ce2535016 (diff) | |
EXP-1672 FIXED Defensive fix for the crash.
Added disconnecting notifications manager callbacks.
Added check to prevent calling the destroyed Notifications object.
Diffstat (limited to 'indra/newview/llnotificationmanager.h')
| -rw-r--r-- | indra/newview/llnotificationmanager.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llnotificationmanager.h b/indra/newview/llnotificationmanager.h index 16e82e4cce..27b6ba1c71 100644 --- a/indra/newview/llnotificationmanager.h +++ b/indra/newview/llnotificationmanager.h @@ -28,6 +28,8 @@ #ifndef LL_LLNOTIFICATIONMANAGER_H #define LL_LLNOTIFICATIONMANAGER_H +#include "llevents.h" + #include "lluictrl.h" #include "llnotificationhandler.h" @@ -47,6 +49,7 @@ class LLToast; class LLNotificationManager : public LLSingleton<LLNotificationManager> { typedef std::pair<std::string, LLEventHandler*> eventhandlers; + typedef std::pair<const std::string, LLBoundListener> listener_pair_t; public: LLNotificationManager(); virtual ~LLNotificationManager(); @@ -70,6 +73,8 @@ private: //TODO (*) std::map<std::string, boost::shared_ptr<LLEventHandler> > mNotifyHandlers; // cruft std::map<std::string, LLChatHandler*> mChatHandlers; + + std::map<std::string, LLBoundListener> mChannelListeners; }; } |