summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterfixedenvironment.cpp
diff options
context:
space:
mode:
authorandreykproductengine <andreykproductengine@lindenlab.com>2018-10-17 18:48:25 +0300
committerandreykproductengine <andreykproductengine@lindenlab.com>2018-10-17 18:48:25 +0300
commit5a4d07f5ab63afc0352ec11d220fe1d5053ee974 (patch)
treed71a3bb4fa3a60d24ce828af703d61f9fc11508e /indra/newview/llfloaterfixedenvironment.cpp
parentf192ecf44b3664a2782d11a10fcb8edbab8a9a92 (diff)
SL-9902 EEP Editors retaining dirty flags when they shouldn't
Diffstat (limited to 'indra/newview/llfloaterfixedenvironment.cpp')
-rw-r--r--indra/newview/llfloaterfixedenvironment.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterfixedenvironment.cpp b/indra/newview/llfloaterfixedenvironment.cpp
index 201c6679b3..ceb68de3c5 100644
--- a/indra/newview/llfloaterfixedenvironment.cpp
+++ b/indra/newview/llfloaterfixedenvironment.cpp
@@ -309,6 +309,8 @@ void LLFloaterFixedEnvironment::onAssetLoaded(LLUUID asset_id, LLSettingsBase::p
return;
}
+ clearDirtyFlag();
+
if (!settings || status)
{
LLSD args;
@@ -434,7 +436,7 @@ void LLFloaterFixedEnvironment::onSaveAsCommit(const LLSD& notification, const L
void LLFloaterFixedEnvironment::onClickCloseBtn(bool app_quitting)
{
if (!app_quitting)
- checkAndConfirmSettingsLoss([this](){ closeFloater(); });
+ checkAndConfirmSettingsLoss([this](){ closeFloater(); clearDirtyFlag(); });
else
closeFloater();
}