diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-03-18 18:09:28 -0700 |
| commit | cb1c85261e768c9653ed40bf6160e7cc7ca9ce74 (patch) | |
| tree | a5cccd2fca9fefe4717168f108bcb8d18fe98cf5 /indra/newview/llfirstuse.h | |
| parent | c2e88db89a8ba111efd0c1b61cc8dec400a007cb (diff) | |
| parent | 6c0fbdafaed93b90354b37513a3b61dee56fb8b2 (diff) | |
Pull in viewer-development
Diffstat (limited to 'indra/newview/llfirstuse.h')
| -rw-r--r-- | indra/newview/llfirstuse.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 489f58626a..42b2ec0c60 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -78,16 +78,15 @@ 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); static void notUsingDestinationGuide(bool enable = true); - static void notUsingAvatarPicker(bool enable = true); static void notUsingSidePanel(bool enable = true); static void notMoving(bool enable = true); static void viewPopup(bool enable = true); @@ -98,8 +97,7 @@ 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> sConfigVariablesEnabled; + static std::set<std::string> sConfigVariables; static void init(); static bool processNotification(const LLSD& notify); |