summaryrefslogtreecommitdiff
path: root/indra/newview/llenvmanager.cpp
diff options
context:
space:
mode:
authorVadim ProductEngine <vsavchuk@productengine.com>2011-05-30 22:34:56 +0300
committerVadim ProductEngine <vsavchuk@productengine.com>2011-05-30 22:34:56 +0300
commit657e434fd59139436e8b97e5ecd01ca686e82269 (patch)
treebebf0c4c8adff3587cec47f6403757f841f5c872 /indra/newview/llenvmanager.cpp
parent6f1cdd4926444567d21b1d6e0735a445b981e56b (diff)
STORM-1253 WIP New day cycle editor.
Done: * Creating new local day cycles. * Editing existing local day cycles. * Deleting day cycles. To do: * Editing region day cycle, dealing with skies in region scope. * Handle teleport while editing a day cycle. * Update UI when a day cycle or sky preset gets deleted. * Make the time ctrl increase/decrease consistently.
Diffstat (limited to 'indra/newview/llenvmanager.cpp')
-rw-r--r--indra/newview/llenvmanager.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp
index d5d03ff1e5..48d84fcffc 100644
--- a/indra/newview/llenvmanager.cpp
+++ b/indra/newview/llenvmanager.cpp
@@ -746,6 +746,7 @@ void LLEnvManagerNew::setUseRegionSettings(bool val)
void LLEnvManagerNew::setUseWaterPreset(const std::string& name)
{
+ // *TODO: make sure the preset exists.
if (name.empty())
{
llwarns << "Empty water preset name passed" << llendl;
@@ -759,6 +760,7 @@ void LLEnvManagerNew::setUseWaterPreset(const std::string& name)
void LLEnvManagerNew::setUseSkyPreset(const std::string& name)
{
+ // *TODO: make sure the preset exists.
if (name.empty())
{
llwarns << "Empty sky preset name passed" << llendl;
@@ -772,9 +774,9 @@ void LLEnvManagerNew::setUseSkyPreset(const std::string& name)
void LLEnvManagerNew::setUseDayCycle(const std::string& name)
{
- if (name.empty())
+ if (!LLDayCycleManager::instance().presetExists(name))
{
- llwarns << "Empty day cycle name passed" << llendl;
+ llwarns << "Invalid day cycle name passed" << llendl;
return;
}
@@ -939,6 +941,8 @@ void LLEnvManagerNew::onRegionChange(bool interpolate)
return;
}
+ // *TODO: clear environment settings of the previous region?
+
// Request environment settings of the new region.
LL_DEBUGS("Windlight") << "New viewer region: " << region_uuid << LL_ENDL;
mCurRegionUUID = region_uuid;