summaryrefslogtreecommitdiff
path: root/indra/newview/llpersistentnotificationstorage.h
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-14 23:44:45 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-11-14 23:44:45 +0200
commit4dd3d230ec7a43845f1a72dfcc7152ab04550d8e (patch)
tree2f6f9feefa9bdd7dd6ee4595bf65ad1af038047e /indra/newview/llpersistentnotificationstorage.h
parentb1ceef6ea4abffdfb36844c3b8e469283edce229 (diff)
parent78bdf57ad6610b34389226bf941ba736ca0c2225 (diff)
Merged in lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llpersistentnotificationstorage.h')
-rw-r--r--indra/newview/llpersistentnotificationstorage.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llpersistentnotificationstorage.h b/indra/newview/llpersistentnotificationstorage.h
index 40c9923c74..1fb4487286 100644
--- a/indra/newview/llpersistentnotificationstorage.h
+++ b/indra/newview/llpersistentnotificationstorage.h
@@ -43,7 +43,7 @@ class LLSD;
// be a) serializable(implement LLNotificationResponderInterface),
// b) registered with LLResponderRegistry (found in llpersistentnotificationstorage.cpp).
-class LLPersistentNotificationStorage : public LLSingleton<LLPersistentNotificationStorage>, public LLNotificationStorage
+class LLPersistentNotificationStorage : public LLParamSingleton<LLPersistentNotificationStorage>, public LLNotificationStorage
{
LLSINGLETON(LLPersistentNotificationStorage);
~LLPersistentNotificationStorage();
@@ -53,11 +53,11 @@ public:
void saveNotifications();
void loadNotifications();
- void initialize();
-
protected:
private:
+ void initialize();
+
bool onPersistentChannelChanged(const LLSD& payload);
bool mLoaded;
};