diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-25 00:17:42 -0800 |
commit | 0bf246ed663ad11d316fe7898a3fee3f57676d4b (patch) | |
tree | 20476d64aecbb1b644ea1f307264c222b7d2e6f6 /indra/newview/llfirstuse.h | |
parent | c2ca71322bf48653d466cba40bbe01c3401318c7 (diff) | |
parent | 109b79e9ad67b5fa8967442a47ef15e456eb5bff (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llfirstuse.h')
-rw-r--r-- | indra/newview/llfirstuse.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llfirstuse.h b/indra/newview/llfirstuse.h index 7b4f9f516f..3c7551f6cb 100644 --- a/indra/newview/llfirstuse.h +++ b/indra/newview/llfirstuse.h @@ -79,6 +79,7 @@ object or from inventory. class LLFirstUse { public: +/* // Add a config variable to be reset on resetFirstUse() static void addConfigVariable(const std::string& var); @@ -97,11 +98,16 @@ public: static void useBuild(); // static void useLeftClickNoHit(); static void useTeleport(); +*/ static void useOverrideKeys(); +/* static void useAttach(); static void useAppearance(); static void useInventory(); + */ static void useSandbox(); + +/* static void useFlexible(); static void useDebugMenus(); static void useSculptedPrim(); @@ -109,6 +115,7 @@ public: protected: static std::set<std::string> sConfigVariables; +*/ }; #endif |