diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-05-05 19:44:47 -0400 |
| commit | a08c362d88487a390de340d75c3394c8800546be (patch) | |
| tree | 1d4a25d8df0a07b85f135cb6359b4d6c8f37fe76 /indra/newview/llfloaterwater.h | |
| parent | def9f9290e661e6a35b7b255eb71b6e2767fdea0 (diff) | |
| parent | 0c7f003bfc3bb9f74b0194ce18861514efe77066 (diff) | |
merge up latest viewer-development
Diffstat (limited to 'indra/newview/llfloaterwater.h')
| -rw-r--r-- | indra/newview/llfloaterwater.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h index e3db91e80d..25858fba01 100644 --- a/indra/newview/llfloaterwater.h +++ b/indra/newview/llfloaterwater.h @@ -33,8 +33,7 @@ #include "llfloater.h" -#include <vector> -#include "llwlparamset.h" +#include "llenvmanager.h" struct WaterVector2Control; struct WaterVector3Control; @@ -53,6 +52,8 @@ public: /// initialize all void initCallbacks(void); + static void show(LLEnvKey::EScope scope = LLEnvKey::SCOPE_LOCAL); + bool newPromptCallback(const LLSD& notification, const LLSD& response); /// general purpose callbacks for dealing with color controllers @@ -101,6 +102,8 @@ public: private: static std::set<std::string> sDefaultPresets; + static LLEnvKey::EScope sScope; + static std::string sOriginalTitle; }; |