diff options
| author | Graham Linden <graham@lindenlab.com> | 2018-10-16 22:00:29 +0100 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2018-10-16 22:00:29 +0100 |
| commit | d8ed800991feaa3264f36f8e62f054bf0fe4d448 (patch) | |
| tree | abae518702ee216e2db6d22bc5e51d1614e3c069 | |
| parent | 295963a8b8a6c22360333933d919c71dabd07b2d (diff) | |
| parent | 4af0b06ca6f10b4d37bab5fbc9768978b5d06298 (diff) | |
Merge
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 1 | ||||
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 4513240407..9c3d35ba10 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -1531,6 +1531,7 @@ void LLFloaterEditExtDayCycle::onIdlePlay(void* user_data) self->mSkyBlender->setPosition(new_frame); self->mWaterBlender->setPosition(new_frame); self->synchronizeTabs(); + self->updateTimeAndLabel(); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index db18d6ed2c..ddd287e6b1 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -8409,6 +8409,20 @@ class LLToolsSelectTool : public view_listener_t /// WINDLIGHT callbacks class LLWorldEnvSettings : public view_listener_t { + void defocusEnvFloaters() + { + //currently there is only one instance of each floater + std::vector<std::string> env_floaters_names = { "env_edit_extdaycycle", "env_fixed_environmentent_water", "env_fixed_environmentent_sky" }; + for (std::vector<std::string>::const_iterator it = env_floaters_names.begin(); it != env_floaters_names.end(); ++it) + { + LLFloater* env_floater = LLFloaterReg::findTypedInstance<LLFloater>(*it); + if (env_floater) + { + env_floater->setFocus(FALSE); + } + } + } + bool handleEvent(const LLSD& userdata) { std::string event_name = userdata.asString(); @@ -8418,30 +8432,35 @@ class LLWorldEnvSettings : public view_listener_t LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_SUNRISE); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().updateEnvironment(); + defocusEnvFloaters(); } else if (event_name == "noon") { LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_MIDDAY); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().updateEnvironment(); + defocusEnvFloaters(); } else if (event_name == "sunset") { LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_SUNSET); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().updateEnvironment(); + defocusEnvFloaters(); } else if (event_name == "midnight") { LLEnvironment::instance().setEnvironment(LLEnvironment::ENV_LOCAL, LLEnvironment::KNOWN_SKY_MIDNIGHT); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().updateEnvironment(); + defocusEnvFloaters(); } else if (event_name == "region") { LLEnvironment::instance().clearEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_LOCAL); LLEnvironment::instance().updateEnvironment(); + defocusEnvFloaters(); } else if (event_name == "pause_clouds") { |