summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexei Arabadji <aarabadji@productengine.com>2009-12-11 12:15:53 +0200
committerAlexei Arabadji <aarabadji@productengine.com>2009-12-11 12:15:53 +0200
commita60997a8812de206beadf714895c3c5eb7d59e91 (patch)
treec0bb828e0c8d60d5b8a276fd87648ce02efa25e3
parente8d3afc99c3914a060384ee9eb6d2b673e76e36f (diff)
parent5e0bd59c616dea79cde604827074bc4be39a7cd1 (diff)
Automated merge with https://hg.aws.productengine.com/secondlife/viewer-2-0/
--HG-- branch : product-engine
-rw-r--r--indra/newview/llchiclet.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp
index 30967677e8..9671c048ef 100644
--- a/indra/newview/llchiclet.cpp
+++ b/indra/newview/llchiclet.cpp
@@ -53,6 +53,7 @@
#include "llgroupmgr.h"
#include "llnotificationmanager.h"
#include "lltransientfloatermgr.h"
+#include "llsyswellwindow.h"
static LLDefaultChildRegistry::Register<LLChicletPanel> t1("chiclet_panel");
static LLDefaultChildRegistry::Register<LLIMWellChiclet> t2_0("chiclet_im_well");
@@ -233,6 +234,10 @@ LLNotificationChiclet::LLNotificationChiclet(const Params& p)
connectCounterUpdatersToSignal("notify");
connectCounterUpdatersToSignal("groupnotify");
connectCounterUpdatersToSignal("offer");
+
+ // ensure that notification well window exists, to synchronously
+ // handle toast add/delete events.
+ LLNotificationWellWindow::getInstance();
}
void LLNotificationChiclet::connectCounterUpdatersToSignal(const std::string& notification_type)