From 667ca55bad0108c4bdf8f007b89e1a52fc766aad Mon Sep 17 00:00:00 2001 From: Kent Quirk Date: Mon, 5 Jan 2009 18:59:12 +0000 Subject: svn merge -r106715:HEAD svn+ssh://svn.lindenlab.com/svn/linden/branches/q/notifications-merge-r106715 . QAR-1149 -- Final merge of notifications to trunk. --- indra/llui/llfloater.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'indra/llui/llfloater.cpp') diff --git a/indra/llui/llfloater.cpp b/indra/llui/llfloater.cpp index 22260b52cf..dd93684a69 100644 --- a/indra/llui/llfloater.cpp +++ b/indra/llui/llfloater.cpp @@ -147,6 +147,7 @@ LLFloater::LLFloater() : } mDragHandle = NULL; mHandle.bind(this); + mNotificationContext = new LLFloaterNotificationContext(getHandle()); } LLFloater::LLFloater(const std::string& name) @@ -220,6 +221,7 @@ void LLFloater::initFloater(const std::string& title, BOOL drag_on_left, BOOL minimizable, BOOL close_btn) { mHandle.bind(this); + mNotificationContext = new LLFloaterNotificationContext(getHandle()); // Init function can be called more than once, so clear out old data. for (S32 i = 0; i < BUTTON_COUNT; i++) @@ -429,6 +431,9 @@ void LLFloater::initFloater(const std::string& title, // virtual LLFloater::~LLFloater() { + delete mNotificationContext; + mNotificationContext = NULL; + control_map_t::iterator itor; for (itor = mFloaterControls.begin(); itor != mFloaterControls.end(); ++itor) { -- cgit v1.3