diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-09-22 15:28:13 -0600 |
| commit | 86e7cc3d35e41a88b25175bafb5687e1864423d9 (patch) | |
| tree | a5ebd2bd8a4d6e87f55d1be6f278b1807b53de0f /indra/llui/llnotifications.h | |
| parent | b62d7c2f06fdaa91312fd6857d03748defe8b60f (diff) | |
| parent | 60ed688026269568a9eef67437dc780f88c92871 (diff) | |
Merge branch 'master' v6.4.9 into DRTVWR-497
Diffstat (limited to 'indra/llui/llnotifications.h')
| -rw-r--r-- | indra/llui/llnotifications.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/llnotifications.h b/indra/llui/llnotifications.h index cac687f53d..2f4578da17 100644 --- a/indra/llui/llnotifications.h +++ b/indra/llui/llnotifications.h @@ -957,6 +957,7 @@ public: private: /*virtual*/ void initSingleton(); + /*virtual*/ void cleanupSingleton(); void loadPersistentNotifications(); @@ -1069,6 +1070,7 @@ public: LLPersistentNotificationChannel() : LLNotificationChannel("Persistent", "Visible", ¬ificationFilter) {} + virtual ~LLPersistentNotificationChannel() {} typedef std::vector<LLNotificationPtr> history_list_t; history_list_t::iterator beginHistory() { sortHistory(); return mHistory.begin(); } |