From 20e78bb88ebe0a5416f3fb272afe9455aa756869 Mon Sep 17 00:00:00 2001
From: maxim_productengine <mnikolenko@productengine.com>
Date: Wed, 3 Oct 2018 13:33:19 +0300
Subject: [PATCH] SL-9780 FIXED [EEP] Environment gets stuck on region
environment after closing Region/Estate floater
---
indra/newview/llpanelenvironment.cpp | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/indra/newview/llpanelenvironment.cpp b/indra/newview/llpanelenvironment.cpp
index ecd67ff8afe..4ab09e7118d 100644
--- a/indra/newview/llpanelenvironment.cpp
+++ b/indra/newview/llpanelenvironment.cpp
@@ -170,7 +170,7 @@ void LLPanelEnvironmentInfo::onVisibilityChange(BOOL new_visibility)
}
gIdleCallbacks.deleteFunction(onIdlePlay, this);
- LLFloaterEditExtDayCycle *dayeditor = getEditFloater();
+ LLFloaterEditExtDayCycle *dayeditor = getEditFloater(false);
if (mCommitConnection.connected())
mCommitConnection.disconnect();
@@ -179,7 +179,10 @@ void LLPanelEnvironmentInfo::onVisibilityChange(BOOL new_visibility)
if (dayeditor->isDirty())
dayeditor->refresh();
else
+ {
dayeditor->closeFloater();
+ mEditFloater.markDead();
+ }
}
}
--
GitLab