summaryrefslogtreecommitdiff
path: root/indra/newview/llfirstuse.h
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-31 12:32:57 -0500
committerOz Linden <oz@lindenlab.com>2011-01-31 12:32:57 -0500
commitcb6d59513eabe72029821a96191873351fd5c753 (patch)
treeed311d11da22ab8d1aff695166d0ca38d269ccae /indra/newview/llfirstuse.h
parentd0b5e6b0b4acebd1b11685dea290b830957ba9dc (diff)
parentbbb4fb10a50495669ec5d49da4a39950a5e2042d (diff)
merge changes for storm-829
Diffstat (limited to 'indra/newview/llfirstuse.h')
-rw-r--r--indra/newview/llfirstuse.h9
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);