diff options
| author | Dave SIMmONs <simon@lindenlab.com> | 2011-02-23 09:04:35 -0800 |
|---|---|---|
| committer | Dave SIMmONs <simon@lindenlab.com> | 2011-02-23 09:04:35 -0800 |
| commit | 1c8c28a8de73228c06fdf2d84045433c7231cd19 (patch) | |
| tree | ea46c284ccb8250f6f34cf21f6208d909c6b69e4 /indra/newview/llfirstuse.h | |
| parent | f91a9c87e5e758ecd32111d901ff32d282b73fa7 (diff) | |
| parent | 40abc0fe1e6edd2f018fcdc35ffccdb5475a5fe0 (diff) | |
Merge latest from lindenlab/viewer-release
Diffstat (limited to 'indra/newview/llfirstuse.h')
| -rw-r--r-- | indra/newview/llfirstuse.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 81659988e6..489f58626a 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -78,11 +78,11 @@ class LLFirstUse public: // Add a config variable to be reset on resetFirstUse() - static void addConfigVariable(const std::string& var); + //static void addConfigVariable(const std::string& var); // Sets all controls back to show the dialogs. - static void disableFirstUse(); - static void resetFirstUse(); + //static void disableFirstUse(); + //static void resetFirstUse(); static void otherAvatarChatFirst(bool enable = true); static void sit(bool enable = true); @@ -98,7 +98,8 @@ public: protected: static void firstUseNotification(const std::string& control_var, bool enable, const std::string& notification_name, LLSD args = LLSD(), LLSD payload = LLSD()); - static std::set<std::string> sConfigVariables; + //static std::set<std::string> sConfigVariables; + static std::set<std::string> sConfigVariablesEnabled; static void init(); static bool processNotification(const LLSD& notify); |