diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:46:15 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2019-11-14 23:46:15 +0200 |
| commit | 4b261a90ae3dead0a1fa843268bae0fda710648b (patch) | |
| tree | 152732b57c90bc23e4893092212a04feff281de5 /indra/newview/llurlwhitelist.h | |
| parent | 26732bc576f86fde532e1f9448bd127515f70612 (diff) | |
| parent | 78bdf57ad6610b34389226bf941ba736ca0c2225 (diff) | |
Merged in lindenlab/viewer-release
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; |