diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-04-24 20:22:45 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-24 20:22:45 +0300 |
| commit | 4c54488470a37f53f46c9d4694644a10b92b9790 (patch) | |
| tree | 494487bbc57c79d17921b7443003d2a118e24ddb /indra/newview/llchiclet.h | |
| parent | 398369233fc2621eb447701e26082057fb0c97d7 (diff) | |
| parent | 85f2447b3ddf7e4b91cd5963cb2e7668d48ab2a9 (diff) | |
Merge pull request #1316 from secondlife/marchcat/a-merge
Release (Maint YZ) -> Maint A merge
Diffstat (limited to 'indra/newview/llchiclet.h')
| -rw-r--r-- | indra/newview/llchiclet.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/llchiclet.h b/indra/newview/llchiclet.h index 08f8ef66b8..75831adf62 100644 --- a/indra/newview/llchiclet.h +++ b/indra/newview/llchiclet.h @@ -531,8 +531,9 @@ public: struct Params : public LLInitParam::Block<Params, LLSysWellChiclet::Params>{}; protected: - struct ChicletNotificationChannel : public LLNotificationChannel + class ChicletNotificationChannel : public LLNotificationChannel { + public: ChicletNotificationChannel(LLNotificationChiclet* chiclet) : LLNotificationChannel(LLNotificationChannel::Params().filter(filterNotification).name(chiclet->getSessionId().asString())) , mChiclet(chiclet) @@ -542,6 +543,7 @@ protected: connectToChannel("Offer"); connectToChannel("Notifications"); } + virtual ~ChicletNotificationChannel() {} static bool filterNotification(LLNotificationPtr notify); // connect counter updaters to the corresponding signals @@ -553,9 +555,10 @@ protected: }; boost::scoped_ptr<ChicletNotificationChannel> mNotificationChannel; - - LLNotificationChiclet(const Params& p); - + + LLNotificationChiclet(const Params& p); + ~LLNotificationChiclet(); + /** * Processes clicks on chiclet menu. */ |