diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-25 13:05:29 -0700 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2010-06-25 13:05:29 -0700 |
commit | 92c33da517fc313ee79011fb072ea116c24e0dfc (patch) | |
tree | 71c8503efcb1607c6e5e7298bc2eff29e0f6ab68 /indra/newview | |
parent | 62cd50fe1edd67308cf0a2e5407bd4005e705681 (diff) | |
parent | 20ea748631386742af4c5ee169926129e8728393 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release
Diffstat (limited to 'indra/newview')
-rw-r--r-- | indra/newview/llinspecttoast.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llinspecttoast.cpp b/indra/newview/llinspecttoast.cpp index 3ca8fa2f56..9a10a7ede8 100644 --- a/indra/newview/llinspecttoast.cpp +++ b/indra/newview/llinspecttoast.cpp @@ -55,7 +55,7 @@ public: private: void onToastDestroy(LLToast * toast); -private: + boost::signals2::scoped_connection mConnection; LLPanel* mPanel; LLScreenChannel* mScreenChannel; }; @@ -88,7 +88,7 @@ void LLInspectToast::onOpen(const LLSD& notification_id) llwarns << "Could not get requested toast from screen channel." << llendl; return; } - toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1)); + mConnection = toast->setOnToastDestroyedCallback(boost::bind(&LLInspectToast::onToastDestroy, this, _1)); LLPanel * panel = toast->getPanel(); panel->setVisible(TRUE); |