diff options
| author | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-10-17 18:48:25 +0300 |
|---|---|---|
| committer | andreykproductengine <andreykproductengine@lindenlab.com> | 2018-10-17 18:48:25 +0300 |
| commit | 5a4d07f5ab63afc0352ec11d220fe1d5053ee974 (patch) | |
| tree | d71a3bb4fa3a60d24ce828af703d61f9fc11508e | |
| parent | f192ecf44b3664a2782d11a10fcb8edbab8a9a92 (diff) | |
SL-9902 EEP Editors retaining dirty flags when they shouldn't
| -rw-r--r-- | indra/newview/llfloatereditextdaycycle.cpp | 3 | ||||
| -rw-r--r-- | indra/newview/llfloaterfixedenvironment.cpp | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llfloatereditextdaycycle.cpp b/indra/newview/llfloatereditextdaycycle.cpp index 9c3d35ba10..3d3ab9e80b 100644 --- a/indra/newview/llfloatereditextdaycycle.cpp +++ b/indra/newview/llfloatereditextdaycycle.cpp @@ -629,7 +629,7 @@ void LLFloaterEditExtDayCycle::onSaveAsCommit(const LLSD& notification, const LL void LLFloaterEditExtDayCycle::onClickCloseBtn(bool app_quitting /*= false*/) { if (!app_quitting) - checkAndConfirmSettingsLoss([this](){ closeFloater(); }); + checkAndConfirmSettingsLoss([this](){ closeFloater(); clearDirtyFlag(); }); else closeFloater(); } @@ -1177,6 +1177,7 @@ void LLFloaterEditExtDayCycle::onAssetLoaded(LLUUID asset_id, LLSettingsBase::pt return; } mExpectingAssetId.setNull(); + clearDirtyFlag(); if (!settings || status) { 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(); } |