diff options
| author | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
|---|---|---|
| committer | Vadim ProductEngine <vsavchuk@productengine.com> | 2011-04-05 20:47:39 +0300 |
| commit | a2c4bb80492132f7981a79e61bd8ddec95ad97dd (patch) | |
| tree | 0aedf927a4a228fb4c4d59905a81d814762ed453 /indra/newview/llfloaterwater.h | |
| parent | 2787be7d3558c3ca1ed15863e875612b1b27ec78 (diff) | |
| parent | 5a0547cdc366678a21c23ac4669d9e1a867ca331 (diff) | |
STORM-1126 merge 2
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; }; |