summaryrefslogtreecommitdiff
path: root/indra/newview/llenvironment.cpp
diff options
context:
space:
mode:
authorRider Linden <rider@lindenlab.com>2018-08-20 16:26:54 -0700
committerRider Linden <rider@lindenlab.com>2018-08-20 16:26:54 -0700
commitb2b3c36bda988be4b433e9f97f13bc1c67722eb7 (patch)
tree877dfa7e15d2dd5daf7816854cbce3c1797eb13f /indra/newview/llenvironment.cpp
parent8fc3956a5eeaa2dffabdcda60800d9c4d4e49c43 (diff)
Didn't get a fix from last week, and divide by zeros are bad.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
-rw-r--r--indra/newview/llenvironment.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp
index 4f7ffe0724..be0c763e25 100644
--- a/indra/newview/llenvironment.cpp
+++ b/indra/newview/llenvironment.cpp
@@ -1421,6 +1421,11 @@ LLEnvironment::EnvironmentInfo::ptr_t LLEnvironment::EnvironmentInfo::extract(LL
pinfo->mDayOffset = LLSettingsDay::Seconds(environment.has(KEY_DAYOFFSET) ? environment[KEY_DAYOFFSET].asInteger() : -1);
pinfo->mDayHash = environment.has(KEY_DAYHASH) ? environment[KEY_DAYHASH].asInteger() : 0;
}
+ else
+ {
+ pinfo->mDayLength = LLEnvironment::instance().getEnvironmentDayLength(ENV_REGION);
+ pinfo->mDayOffset = LLEnvironment::instance().getEnvironmentDayOffset(ENV_REGION);
+ }
if (environment.has(KEY_DAYASSET))
{