From a32a4dc6369dd076eb75e648674843bd16a9258e Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
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/llfloaterfixedenvironment.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'indra/newview/llfloaterfixedenvironment.cpp')

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