diff options
| author | Richard Linden <none@none> | 2013-06-24 15:01:34 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-06-24 15:01:34 -0700 |
| commit | 9f58b3ccbdb9e73e1faec6ec5cfa3bfeec1fd581 (patch) | |
| tree | 5dee4955e2257878e1bced15e03c51b7b3c773bb /indra | |
| parent | 6bb64e79985f0b724dd5b07703666e307a54a98b (diff) | |
| parent | 8554eb5fcd1bfe7066ae6f6130378a1dfa3141dc (diff) | |
Automated merge with https://bitbucket.org/lindenlab/viewer-interesting
Diffstat (limited to 'indra')
| -rwxr-xr-x | indra/llui/llnotifications.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.cpp b/indra/llui/llnotifications.cpp index 37b0a52036..7932299281 100755 --- a/indra/llui/llnotifications.cpp +++ b/indra/llui/llnotifications.cpp @@ -1207,6 +1207,9 @@ LLNotifications::LLNotifications() mIgnoreAllNotifications(false) { LLUICtrl::CommitCallbackRegistry::currentRegistrar().add("Notification.Show", boost::bind(&LLNotifications::addFromCallback, this, _2)); + + // touch the instance tracker for notification channels, so that it will still be around in our destructor + LLInstanceTracker<LLNotificationChannel, std::string>::instanceCount(); } |