diff options
author | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2019-11-13 16:46:27 -0700 |
commit | dc1453af9c474c67749aded576c11dff3afdd444 (patch) | |
tree | bff4d5bfca6eb036339c30429ef08704d0bb68cb /indra/newview/llurlwhitelist.h | |
parent | 3dfdb2f6e8be4fb2a08102847520585dc1d8fd7d (diff) | |
parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) |
Merge in from viewer-release 6.3.5
Diffstat (limited to 'indra/newview/llurlwhitelist.h')
-rw-r--r-- | indra/newview/llurlwhitelist.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/indra/newview/llurlwhitelist.h b/indra/newview/llurlwhitelist.h index b0969051a7..c2511b08fd 100644 --- a/indra/newview/llurlwhitelist.h +++ b/indra/newview/llurlwhitelist.h @@ -30,15 +30,11 @@ #include <list> -class LLUrlWhiteList +class LLUrlWhiteList : public LLSingleton<LLUrlWhiteList> { + LLSINGLETON(LLUrlWhiteList); + ~LLUrlWhiteList(); public: - virtual ~LLUrlWhiteList (); - - static void initClass(); - static void cleanupClass(); - static LLUrlWhiteList* getInstance (); - bool load (); bool save (); @@ -51,9 +47,6 @@ class LLUrlWhiteList bool getNext ( std::string& valueOut ); private: - LLUrlWhiteList (); - static LLUrlWhiteList* sInstance; - typedef std::vector < std::string > string_list_t ; bool mLoaded; |