summaryrefslogtreecommitdiff
path: root/indra/newview/llinspecttoast.cpp
diff options
context:
space:
mode:
authorAndrew A. de Laix <alain@lindenlab.com>2010-06-25 13:03:31 -0700
committerAndrew A. de Laix <alain@lindenlab.com>2010-06-25 13:03:31 -0700
commit20ea748631386742af4c5ee169926129e8728393 (patch)
treea422fa51e559b74e401dd6ab237f7ad1f9e1a51c /indra/newview/llinspecttoast.cpp
parentbd068caa4ca6f0a80d3e206bca1d7c88d18836a5 (diff)
Fix EXT-8075: close signal connection on destruction to prevent callbacks after LLInspectToast is, well, toast.
Diffstat (limited to 'indra/newview/llinspecttoast.cpp')
-rw-r--r--indra/newview/llinspecttoast.cpp4
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);