diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-04-22 18:25:57 -0400 |
| commit | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (patch) | |
| tree | b89e53c972d8db034d74e1dbc55bf27ab82d3b88 /indra/newview/llfloaterwater.h | |
| parent | 391bef0df021dd3a56c262087ba977ab9f2bb662 (diff) | |
| parent | 95847fc2061e9b71a4d2ce078b525c047fc4ad36 (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; }; |