diff options
| author | James Cook <james@lindenlab.com> | 2010-02-26 11:53:45 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2010-02-26 11:53:45 -0800 |
| commit | 86d8b98f51e9878ff2c97d5b2531e1b6594383f4 (patch) | |
| tree | 8790e316e94952c30908539bf0bb8e88bc1b161f /indra/newview | |
| parent | 36c35bca2663447216027015c10aa921ab75abfb (diff) | |
DEV-46659 Identity Evolution - SLID - Banned Residents name does not appear on the Estate tab under Region/Estate
Fixed button enablement for add/remove ban. The buttons are supposed to be disabled on the mainland, even for gods.
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterregioninfo.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index d54736e942..0139d0e301 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -1972,8 +1972,15 @@ void LLPanelEstateInfo::updateControls(LLViewerRegion* region) childSetEnabled("remove_allowed_avatar_btn", god || owner || manager); childSetEnabled("add_allowed_group_btn", god || owner || manager); childSetEnabled("remove_allowed_group_btn", god || owner || manager); - childSetEnabled("add_banned_avatar_btn", god || owner || manager); - childSetEnabled("remove_banned_avatar_btn", god || owner || manager); + + // Can't ban people from mainland, orientation islands, etc. because this + // creates much network traffic and server load. + // Disable their accounts in CSR tool instead. + bool linden_estate = (getEstateID() <= ESTATE_LAST_LINDEN); + bool enable_ban = (god || owner || manager) && !linden_estate; + childSetEnabled("add_banned_avatar_btn", enable_ban); + childSetEnabled("remove_banned_avatar_btn", enable_ban); + childSetEnabled("message_estate_btn", god || owner || manager); childSetEnabled("kick_user_from_estate_btn", god || owner || manager); |