diff options
author | Jacek Antonelli | 2008-08-15 23:45:17 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:17 -0500 |
commit | 7c207214b86dc5675e2d136cc34e9b209209dc4b (patch) | |
tree | dfbdef0c039221cfadd7c26c839f446064263ddd /linden/indra/newview/llnotify.cpp | |
parent | Second Life viewer sources 1.18.5.0-RC (diff) | |
download | meta-impy-7c207214b86dc5675e2d136cc34e9b209209dc4b.zip meta-impy-7c207214b86dc5675e2d136cc34e9b209209dc4b.tar.gz meta-impy-7c207214b86dc5675e2d136cc34e9b209209dc4b.tar.bz2 meta-impy-7c207214b86dc5675e2d136cc34e9b209209dc4b.tar.xz |
Second Life viewer sources 1.18.5.1-RC
Diffstat (limited to '')
-rw-r--r-- | linden/indra/newview/llnotify.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/linden/indra/newview/llnotify.cpp b/linden/indra/newview/llnotify.cpp index 92224b8..cd22343 100644 --- a/linden/indra/newview/llnotify.cpp +++ b/linden/indra/newview/llnotify.cpp | |||
@@ -98,7 +98,7 @@ LLNotifyBox* LLNotifyBox::showXml( const LLString& xml_desc, const LLString::for | |||
98 | } | 98 | } |
99 | else | 99 | else |
100 | { | 100 | { |
101 | LLNotifyBox* notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution); | 101 | notify = new LLNotifyBox(xml_template, args, callback, user_data, is_caution); |
102 | gNotifyBoxView->addChildAtEnd(notify); | 102 | gNotifyBoxView->addChildAtEnd(notify); |
103 | notify->moveToBack(); | 103 | notify->moveToBack(); |
104 | } | 104 | } |
@@ -744,6 +744,7 @@ void LLNotifyBox::onClickButton(void* data) | |||
744 | if (self->mBehavior->mCallback) | 744 | if (self->mBehavior->mCallback) |
745 | { | 745 | { |
746 | self->mBehavior->mCallback(button, self->mBehavior->mData); | 746 | self->mBehavior->mCallback(button, self->mBehavior->mData); |
747 | self->mBehavior->mCallback = NULL; // Notification callbacks only expect to be called once ever | ||
747 | } | 748 | } |
748 | 749 | ||
749 | self->close(); | 750 | self->close(); |