diff options
| author | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2017-05-23 16:51:51 +0000 |
|---|---|---|
| committer | Andrey Lihatskiy <andreylproductengine@lindenlab.com> | 2017-05-23 16:51:51 +0000 |
| commit | a01b7fc281957c8896d760236e63bd04686e0832 (patch) | |
| tree | ddcc4a51276630b88f019a4ab294d29661c31bfe | |
| parent | c9f9e93889ae7400f242db6cc3b01469532c1def (diff) | |
| parent | c33fb844ab87c85d8989ea909423b559d417b250 (diff) | |
Merged in andreyl_productengine/viewer-neko-marchcat (pull request #275)
MAINT-7396 [JigglyPuff] Agent that is not estate owner or estate manager shouldn't be able to toggle estate access settings.
Approved-by: Andrey Kleshchev <andreykproductengine@lindenlab.com>
Approved-by: simon_linden <simon@lindenlab.com>
Approved-by: Rider Linden <rider@lindenlab.com>
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index c33dee5fb4..1af2c10a33 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -2296,7 +2296,7 @@ BOOL LLPanelEstateInfo::postBuild() void LLPanelEstateInfo::refresh() { // Disable access restriction controls if they make no sense. - bool public_access = getChild<LLRadioGroup>("externally_visible_radio")->getSelectedIndex(); + bool public_access = ("estate_public_access" == getChild<LLUICtrl>("externally_visible_radio")->getValue().asString()); getChildView("Only Allow")->setEnabled(public_access); getChildView("limit_payment")->setEnabled(public_access); @@ -2317,7 +2317,7 @@ void LLPanelEstateInfo::refreshFromEstate() getChild<LLUICtrl>("estate_name")->setValue(estate_info.getName()); setOwnerName(LLSLURL("agent", estate_info.getOwnerID(), "inspect").getSLURLString()); - getChild<LLRadioGroup>("externally_visible_radio")->setSelectedIndex(estate_info.getIsExternallyVisible() ? 1 : 0); + getChild<LLUICtrl>("externally_visible_radio")->setValue(estate_info.getIsExternallyVisible() ? "estate_public_access" : "estate_restricted_access"); getChild<LLUICtrl>("voice_chat_check")->setValue(estate_info.getAllowVoiceChat()); getChild<LLUICtrl>("allow_direct_teleport")->setValue(estate_info.getAllowDirectTeleport()); getChild<LLUICtrl>("limit_payment")->setValue(estate_info.getDenyAnonymous()); @@ -2360,7 +2360,7 @@ bool LLPanelEstateInfo::callbackChangeLindenEstate(const LLSD& notification, con // update model estate_info.setUseFixedSun(false); // we don't support fixed sun estates anymore - estate_info.setIsExternallyVisible(getChild<LLRadioGroup>("externally_visible_radio")->getSelectedIndex()); + estate_info.setIsExternallyVisible("estate_public_access" == getChild<LLUICtrl>("externally_visible_radio")->getValue().asString()); estate_info.setAllowDirectTeleport(getChild<LLUICtrl>("allow_direct_teleport")->getValue().asBoolean()); estate_info.setDenyAnonymous(getChild<LLUICtrl>("limit_payment")->getValue().asBoolean()); estate_info.setDenyAgeUnverified(getChild<LLUICtrl>("limit_age_verified")->getValue().asBoolean()); |