diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 0e0e0ca18d..06f06c7dc6 100644 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -62,7 +62,7 @@ #include "llspinctrl.h" #include "roles_constants.h" #include "llgroupactions.h" -// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) +// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.2a) #include "rlvhandler.h" // [/RLVa:KB] @@ -365,16 +365,16 @@ void LLPanelPermissions::refresh() // getChildView("Owner Name")->setEnabled(TRUE); // [RLVa:KB] - Moved further down to avoid an annoying flicker when the text is set twice in a row -// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.2.1b +// [RLVa:KB] - Checked: 2010-11-02 (RLVa-1.2.2a) | Modified: RLVa-1.2.2a if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) { // Only anonymize the creator if all of the selection was created by the same avie who's also the owner or they're a nearby avie - if ( (creators_identical) && ((mCreatorID == mOwnerID) || (RlvUtil::isNearbyAgent(mCreatorID))) ) - creator_name = RlvStrings::getAnonym(creator_name); + if ( (creators_identical) && (mCreatorID != gAgent.getID()) && ((mCreatorID == mOwnerID) || (RlvUtil::isNearbyAgent(mCreatorID))) ) + creator_name = LLSLURL("agent", mCreatorID, "rlvanonym").getSLURLString(); // Only anonymize the owner name if all of the selection is owned by the same avie and isn't group owned - if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) ) - owner_name = RlvStrings::getAnonym(owner_name); + if ( (owners_identical) && (!LLSelectMgr::getInstance()->selectIsGroupOwned()) && (mOwnerID != gAgent.getID()) ) + owner_name = LLSLURL("agent", mOwnerID, "rlvanonym").getSLURLString(); } getChild("Creator Name")->setValue(creator_name);