aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llpanelpermissions.cpp
diff options
context:
space:
mode:
authorMcCabe Maxsted2010-08-19 10:54:12 -0700
committerMcCabe Maxsted2010-08-26 11:22:52 -0700
commitfee791f808c6adcb114302f39aacce4d5834edf5 (patch)
tree8328ae00e6af4163f68adfaf12e0947e91b84135 /linden/indra/newview/llpanelpermissions.cpp
parentDisable ParticleChat by default, as it's a privacy concern. (diff)
downloadmeta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.zip
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.gz
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.bz2
meta-impy-fee791f808c6adcb114302f39aacce4d5834edf5.tar.xz
Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llpanelpermissions.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index cd1aee7..a97d177 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -354,10 +354,7 @@ void LLPanelPermissions::refresh()
354 fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); 354 fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
355// [/RLVa:KB] 355// [/RLVa:KB]
356 356
357 //if (owner_name != last_owner_name) 357 if (owner_name != last_owner_name)
358// [RLVa:KB]
359 if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
360// [/RLVa:KB]
361 { 358 {
362 childSetEnabled("Last Owner:", TRUE); 359 childSetEnabled("Last Owner:", TRUE);
363 childSetText("Last Owner Name", last_owner_name); 360 childSetText("Last Owner Name", last_owner_name);
@@ -903,7 +900,13 @@ void LLPanelPermissions::onClickLastOwner(void *data)
903 900
904 if ( self->mLastOwnerID.notNull() ) 901 if ( self->mLastOwnerID.notNull() )
905 { 902 {
906 LLFloaterAvatarInfo::showFromObject(self->mLastOwnerID); 903// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
904 if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
905 {
906 LLFloaterAvatarInfo::showFromObject(self->mLastOwnerID);
907 }
908// [/RLVa:KB]
909// LLFloaterAvatarInfo::showFromObject(self->mLastOwnerID);
907 } 910 }
908} 911}
909 912