summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-03 11:54:19 +0200
committerMnikolenko ProductEngine <mnikolenko@productengine.com>2014-12-03 11:54:19 +0200
commit8c8bef36c049e78cc524e71fb6f740426fb3ce70 (patch)
tree0948c9c8daed16a9d1796fd532def1c3f80a121d /indra/newview
parent6cffbfba8b7dd1f6752fb2b4a93265906e9aeb9c (diff)
MAINT-4704 FIXED Don't show warning message for "region" item, when fixed sky is used.
Diffstat (limited to 'indra/newview')
-rwxr-xr-xindra/newview/llviewermenu.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index c76e4ca46d..642a6e2a69 100755
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -8285,6 +8285,10 @@ class LLWorldEnableEnvSettings : public view_listener_t
{
result = (LLEnvManagerNew::instance().getSkyPresetName() == "Midnight");
}
+ else if (tod == "region")
+ {
+ return false;
+ }
else
{
LL_WARNS() << "Unknown time-of-day item: " << tod << LL_ENDL;