diff options
author | Rider Linden <rider@lindenlab.com> | 2019-04-04 11:47:28 -0700 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2019-04-04 11:47:28 -0700 |
commit | dfdeeb353ce20294ff87190fc95313a81581bd49 (patch) | |
tree | 6885454b41e4a0c2f479c2972b128167a935f5c5 /indra/newview/llfloaterregioninfo.cpp | |
parent | 7703ae3b1b6565694e59a6eef74c8ac9b0ddd158 (diff) |
SL-10849: Select the correct notification for unchecking the parcel owners may override button.
Diffstat (limited to 'indra/newview/llfloaterregioninfo.cpp')
-rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index 9f33feb901..a7887eb9b4 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -3257,13 +3257,14 @@ void LLPanelRegionEnvironment::onChkAllowOverride(bool value) mAllowOverrideRestore = mAllowOverride; mAllowOverride = value; - LLNotification::Params params("ChangeLindenEstate"); - params.functor.function([this](const LLSD& notification, const LLSD& response) { confirmUpdateEstateEnvironment(notification, response); }); std::string notification("EstateParcelEnvironmentOverride"); if (LLPanelEstateInfo::isLindenEstate()) notification = "ChangeLindenEstate"; + LLNotification::Params params(notification); + params.functor.function([this](const LLSD& notification, const LLSD& response) { confirmUpdateEstateEnvironment(notification, response); }); + if (!value || LLPanelEstateInfo::isLindenEstate()) { // warn if turning off or a Linden Estate LLNotifications::instance().add(params); |