summaryrefslogtreecommitdiff
path: root/indra/llui
diff options
context:
space:
mode:
authorKelly Washington <kelly@lindenlab.com>2012-09-26 14:40:16 -0700
committerKelly Washington <kelly@lindenlab.com>2012-09-26 14:40:16 -0700
commitc6a5b62152ec81b3b01f5c5cf2142178bea30ad8 (patch)
treef520120a5d31ce538d003953468bb994ceeee250 /indra/llui
parentadce92282bd190f97b377512ce76fe375e0f115a (diff)
MAINT-994 Oskar Linden login issues
* Set max persistent notifications to 250 * Don't register for notification callbacks until after peristent ones are loaded. reviewed with Simon
Diffstat (limited to 'indra/llui')
-rw-r--r--indra/llui/llnotifications.cpp5
-rw-r--r--indra/llui/llnotifications.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp
index 629eef2c3b..f449800ffd 100644
--- a/indra/llui/llnotifications.cpp
+++ b/indra/llui/llnotifications.cpp
@@ -1116,6 +1116,11 @@ bool LLNotificationChannel::isEmpty() const
return mItems.empty();
}
+S32 LLNotificationChannel::size() const
+{
+ return mItems.size();
+}
+
LLNotificationChannel::Iterator LLNotificationChannel::begin()
{
return mItems.begin();
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h
index 4ae02b943f..d7534c416d 100644
--- a/indra/llui/llnotifications.h
+++ b/indra/llui/llnotifications.h
@@ -813,6 +813,7 @@ public:
std::string getParentChannelName() { return mParent; }
bool isEmpty() const;
+ S32 size() const;
Iterator begin();
Iterator end();