From dfdeeb353ce20294ff87190fc95313a81581bd49 Mon Sep 17 00:00:00 2001 From: Rider Linden Date: Thu, 4 Apr 2019 11:47:28 -0700 Subject: SL-10849: Select the correct notification for unchecking the parcel owners may override button. --- indra/newview/llfloaterregioninfo.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/newview') 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); -- cgit v1.2.3