diff options
| author | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
|---|---|---|
| committer | Erik Kundiman <erik@megapahit.org> | 2024-04-25 11:06:37 +0800 |
| commit | f7b2c0d7d95ca8609a948a7d11b44534d8ac5249 (patch) | |
| tree | b9d80bc52d207acf50ea01b465ab26749ba40f72 /indra/newview/llchiclet.h | |
| parent | c82295910685c54acf597277e9dac0f70eb40239 (diff) | |
| parent | fc71a9c1ed96cb1cb97124e3cceabdfa11e1cc75 (diff) | |
Merge tag '7.1.6-release'
source for viewer 7.1.6.8745209917
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 58a797218f..1698fa269a 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. */ |