diff options
Diffstat (limited to 'indra/newview/llfloaterwater.h')
| -rw-r--r-- | indra/newview/llfloaterwater.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index 3bdec389f3..57e44f7930 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -33,8 +33,10 @@ #include "llfloater.h" +#if 0 #include <vector> #include "llwlparamset.h" +#endif #include "llenvmanager.h" struct WaterVector2Control; @@ -54,10 +56,7 @@ public: /// initialize all void initCallbacks(void); - // one instance only - static LLFloaterWater* instance(); - - void show(LLEnvKey::EScope scope); + static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); bool newPromptCallback(const LLSD& notification, const LLSD& response); @@ -109,8 +108,6 @@ private: static std::set<std::string> sDefaultPresets; static LLEnvKey::EScope sScope; static std::string sOriginalTitle; - - static LLFloaterWater* sWater; }; |