diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-12-21 15:30:57 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-12-21 15:30:57 -0800 |
| commit | 8227a0b270f6e7cc521adeb7b97ad2d5fb646973 (patch) | |
| tree | f03d3a12f94c503350dd11b7167b541a98306757 /indra/newview/llenvironment.cpp | |
| parent | 634910f685057c50ae3233d9f71d4b21cf958749 (diff) | |
SL-10279: Rework the environment pannel. Still in progress.
Diffstat (limited to 'indra/newview/llenvironment.cpp')
| -rw-r--r-- | indra/newview/llenvironment.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llenvironment.cpp b/indra/newview/llenvironment.cpp index a8a386edee..3541eb40fa 100644 --- a/indra/newview/llenvironment.cpp +++ b/indra/newview/llenvironment.cpp @@ -1600,6 +1600,7 @@ LLEnvironment::EnvironmentInfo::ptr_t LLEnvironment::EnvironmentInfo::extract(LL LLSD daynames = environment[KEY_DAYNAMES]; if (daynames.isArray()) { + pinfo->mDayCycleName.clear(); for (S32 index = 0; index < pinfo->mNameList.size(); ++index) { pinfo->mNameList[index] = daynames[index].asString(); @@ -1607,9 +1608,19 @@ LLEnvironment::EnvironmentInfo::ptr_t LLEnvironment::EnvironmentInfo::extract(LL } else if (daynames.isString()) { + for (std::string &name: pinfo->mNameList) + { + name.clear(); + } + pinfo->mDayCycleName = daynames.asString(); } } + else if (pinfo->mDayCycle) + { + pinfo->mDayCycleName = pinfo->mDayCycle->getName(); + } + if (environment.has(KEY_ENVVERSION)) { |