From a32a4dc6369dd076eb75e648674843bd16a9258e Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Mon, 3 Sep 2018 15:20:53 +0300 Subject: MAINT-9068 FIXED EEP closing Day Cycle editor by clicking Cancel makes the environment static --- indra/newview/llfloatereditextdaycycle.cpp | 7 +++++-- indra/newview/llfloaterfixedenvironment.cpp | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'indra/newview') diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 6abb698785..a1689ed04c 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -343,8 +343,11 @@ void LLFloaterEditExtDayCycle::onClose(bool app_quitting) void LLFloaterEditExtDayCycle::onFocusReceived() { - updateEditEnvironment(); - LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_FAST); + if (isInVisibleChain()) + { + updateEditEnvironment(); + LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_FAST); + } } void LLFloaterEditExtDayCycle::onFocusLost() diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp index ece4898935..82f056710e 100644 --- a/indra/newview/llfloaterfixedenvironment.cpp +++ b/indra/newview/llfloaterfixedenvironment.cpp @@ -147,8 +147,11 @@ void LLFloaterFixedEnvironment::onClose(bool app_quitting) void LLFloaterFixedEnvironment::onFocusReceived() { - updateEditEnvironment(); - LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_FAST); + if (isInVisibleChain()) + { + updateEditEnvironment(); + LLEnvironment::instance().setSelectedEnvironment(LLEnvironment::ENV_EDIT, LLEnvironment::TRANSITION_FAST); + } } void LLFloaterFixedEnvironment::onFocusLost() -- cgit v1.2.3