summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterwater.h
diff options
context:
space:
mode:
authorNyx (Neal Orman) <nyx@lindenlab.com>2010-09-27 22:56:08 -0400
committerNyx (Neal Orman) <nyx@lindenlab.com>2010-09-27 22:56:08 -0400
commite045d212d35354d679c2d2e05c6d4689f9f8ac95 (patch)
tree20ba9f542316816d82dbc092d52a63fccde3d7e7 /indra/newview/llfloaterwater.h
parente6688f993f82d2683e3eadce96c893959c94be2d (diff)
STORM-1126 WIP Windlight Estate Settings port from 1.23: first pass at merging in windlight estate settings to viewer-dev codebase.
not built, not tested. Probably needs a bunch of fixes to be able to be integrated. (resubmitted by Vadim ProductEngine)
Diffstat (limited to 'indra/newview/llfloaterwater.h')
-rw-r--r--indra/newview/llfloaterwater.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llfloaterwater.h b/indra/newview/llfloaterwater.h
index e3db91e80d..57fb9745b1 100644
--- a/indra/newview/llfloaterwater.h
+++ b/indra/newview/llfloaterwater.h
@@ -101,6 +101,8 @@ public:
private:
static std::set<std::string> sDefaultPresets;
+ static LLEnvKey::EScope sScope;
+ static std::string sOriginalTitle;
};