Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in RLVa. Viewer broken!

Browse Source
This commit is contained in:
Siana Gearz
2010-11-07 05:05:47 +01:00
parent ae4a9521af
commit 740b570168
94 changed files with 11249 additions and 503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
indra/newview/llpanelpermissions.cpp
View File

@@ -69,6 +69,10 @@
// [RLVa:KB]
#include "rlvhandler.h"
// [/RLVa:KB]
///----------------------------------------------------------------------------
/// Class llpanelpermissions
///----------------------------------------------------------------------------
@@ -336,30 +340,24 @@ void LLPanelPermissions::refresh()
}
}
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
bool fRlvEnableOwner = true;
if ( (rlv_handler_t::isEnabled()) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
{
// Only filter the owner name if: the selection is all owned by the same avie and not group owned
if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) )
{
owner_name = RlvStrings::getAnonym(owner_name);
fRlvEnableOwner = false;
}
}
// [/RLVa:KB]
childSetText("Owner Name",owner_name);
childSetEnabled("Owner Name",TRUE);
childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
// childSetEnabled("button owner profile",owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
childSetEnabled("button owner profile",
fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
// [/RLVa:KB]
@@ -888,7 +886,13 @@ void LLPanelPermissions::onClickOwner(void *data)
}
else
{
LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
{
LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
}
// [/RLVa:KB]
// LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
}
}