summaryrefslogtreecommitdiff
path: root/indra/newview/llinspecttoast.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-06-28 12:32:21 -0400
committerLoren Shih <seraph@lindenlab.com>2010-06-28 12:32:21 -0400
commit3fca4b0d61ad4534f26a8963ed6381a76e4f7c19 (patch)
treebd563f39e6bbd5984c4c529bf0252de9b94f2ea5 /indra/newview/llinspecttoast.cpp
parent3ce3df564351ad7b6fb0acd4e0252b5f89f2a47e (diff)
parent8d18056e8296472d58a820fd77a6a66100e70661 (diff)
automated merge
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);