diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-10-13 08:43:03 -0400 |
| commit | 69ff937e47248eca0a4f876efebe97ee57bd4da9 (patch) | |
| tree | 4fde61ed0ed439b0bf033b15f6703d72bee6f561 /indra/newview/llpaneltopinfobar.cpp | |
| parent | 9367a3787929dfff8b46763d9a7b4872c469e85a (diff) | |
| parent | 4312629e7c5749b86add9d42e6e550602f34dbf5 (diff) | |
merge changes for 3.8.5-release
Diffstat (limited to 'indra/newview/llpaneltopinfobar.cpp')
| -rwxr-xr-x | indra/newview/llpaneltopinfobar.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/newview/llpaneltopinfobar.cpp b/indra/newview/llpaneltopinfobar.cpp index ac9a31ce4e..109013498e 100755 --- a/indra/newview/llpaneltopinfobar.cpp +++ b/indra/newview/llpaneltopinfobar.cpp @@ -313,14 +313,11 @@ void LLPanelTopInfoBar::updateParcelIcons() bool allow_damage = vpm->allowAgentDamage(agent_region, current_parcel); bool see_avs = current_parcel->getSeeAVs(); - bool is_parcel_owner = (gAgent.getID() == current_parcel->getOwnerID()); - bool allow_group_modify = (gAgent.isInGroup(current_parcel->getGroupID()) && current_parcel->getAllowGroupModify()); - // Most icons are "block this ability" mParcelIcon[VOICE_ICON]->setVisible( !allow_voice ); mParcelIcon[FLY_ICON]->setVisible( !allow_fly ); mParcelIcon[PUSH_ICON]->setVisible( !allow_push ); - mParcelIcon[BUILD_ICON]->setVisible( !allow_build && !is_parcel_owner && !allow_group_modify ); + mParcelIcon[BUILD_ICON]->setVisible( !allow_build ); mParcelIcon[SCRIPTS_ICON]->setVisible( !allow_scripts ); mParcelIcon[DAMAGE_ICON]->setVisible( allow_damage ); mDamageText->setVisible(allow_damage); |