livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-10849: Select the correct notification for unchecking the parcel owners may override button.

master
Rider Linden 2019-04-04 11:47:28 -07:00
parent 7703ae3b1b
commit dfdeeb353c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llfloaterregioninfo.cpp
View File

@ -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);