From 9dbe5f46eb6d567b05339498520066ca6c22145b Mon Sep 17 00:00:00 2001
From: Kitty Barnett <none@none>
Date: Wed, 25 Aug 2010 05:49:44 +0200
Subject: [PATCH] - fixed : object owner name isn't anonimized when
@shownames=n restricted (continued) -> fixed on the "Item Profile"
sidebar panel -> fixed on the properties floater (non-functional now?)
--HG--
branch : RLVa
---
indra/newview/llfloaterproperties.cpp | 39 ++++++++++++++++++++-------
indra/newview/llsidepaneliteminfo.cpp | 38 ++++++++++++++++++++++++--
2 files changed, 66 insertions(+), 11 deletions(-)
diff --git a/indra/newview/llfloaterproperties.cpp b/indra/newview/llfloaterproperties.cpp
index a4f67e47d0..6fc1f229d8 100644
--- a/indra/newview/llfloaterproperties.cpp
+++ b/indra/newview/llfloaterproperties.cpp
@@ -58,6 +58,9 @@
#include "lluictrlfactory.h"
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b)
+#include "rlvhandler.h"
+// [/RLVa:KB]
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLPropertiesObserver
@@ -280,6 +283,16 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
childSetEnabled("BtnCreator",TRUE);
childSetEnabled("LabelCreatorTitle",TRUE);
childSetEnabled("LabelCreatorName",TRUE);
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
+ // If the object creator matches the object owner we need to anonimize the creator field as well
+ if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) &&
+ ( ((perm.isOwned()) && (!perm.isGroupOwned()) && (perm.getOwner() == item->getCreatorUUID()) ) ||
+ (RlvHandler::isNearbyAgent(item->getCreatorUUID())) ) )
+ {
+ childSetEnabled("BtnCreator", FALSE);
+ name = RlvStrings::getAnonym(name);
+ }
+// [/RLVa:KB]
childSetText("LabelCreatorName",name);
}
else
@@ -303,21 +316,14 @@ void LLFloaterProperties::refreshFromItem(LLInventoryItem* item)
else
{
gCacheName->getFullName(perm.getOwner(), name);
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
-/*
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
- {
name = RlvStrings::getAnonym(name);
- }
-*/
// [/RLVa:KB]
}
// childSetEnabled("BtnOwner",TRUE);
-// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
- childSetEnabled("BtnOwner",TRUE);
-/*
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Added: RLVa-1.0.0e
childSetEnabled("BtnOwner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
-*/
// [/RLVa:KB]
childSetEnabled("LabelOwnerTitle",TRUE);
childSetEnabled("LabelOwnerName",TRUE);
@@ -555,6 +561,17 @@ void LLFloaterProperties::onClickCreator()
if(!item) return;
if(!item->getCreatorUUID().isNull())
{
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Added: RLVa-1.2.1b
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ {
+ const LLPermissions& perm = item->getPermissions();
+ if ( ((perm.isOwned()) && (!perm.isGroupOwned()) && (perm.getOwner() == item->getCreatorUUID()) ) ||
+ (RlvHandler::isNearbyAgent(item->getCreatorUUID())) )
+ {
+ return;
+ }
+ }
+// [/RLVa:KB]
LLAvatarActions::showProfile(item->getCreatorUUID());
}
}
@@ -570,6 +587,10 @@ void LLFloaterProperties::onClickOwner()
}
else
{
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ return;
+// [/RLVa:KB]
LLAvatarActions::showProfile(item->getPermissions().getOwner());
}
}
diff --git a/indra/newview/llsidepaneliteminfo.cpp b/indra/newview/llsidepaneliteminfo.cpp
index d98398c484..9ad63edd2e 100644
--- a/indra/newview/llsidepaneliteminfo.cpp
+++ b/indra/newview/llsidepaneliteminfo.cpp
@@ -42,7 +42,9 @@
#include "llviewercontrol.h"
#include "llviewerinventory.h"
#include "llviewerobjectlist.h"
-
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b)
+#include "rlvhandler.h"
+// [/RLVa:KB]
//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// Class LLItemPropertiesObserver
@@ -280,6 +282,16 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
childSetEnabled("BtnCreator",TRUE);
childSetEnabled("LabelCreatorTitle",TRUE);
childSetEnabled("LabelCreatorName",TRUE);
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
+ // If the object creator matches the object owner we need to anonimize the creator field as well
+ if ( (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) &&
+ ( ((perm.isOwned()) && (!perm.isGroupOwned()) && (perm.getOwner() == item->getCreatorUUID()) ) ||
+ (RlvHandler::isNearbyAgent(item->getCreatorUUID())) ) )
+ {
+ childSetEnabled("BtnCreator", FALSE);
+ name = RlvStrings::getAnonym(name);
+ }
+// [/RLVa:KB]
childSetText("LabelCreatorName",name);
}
else
@@ -303,8 +315,15 @@ void LLSidepanelItemInfo::refreshFromItem(LLViewerInventoryItem* item)
else
{
gCacheName->getFullName(perm.getOwner(), name);
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ name = RlvStrings::getAnonym(name);
+// [/RLVa:KB]
}
- childSetEnabled("BtnOwner",TRUE);
+// childSetEnabled("BtnOwner",TRUE);
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Added: RLVa-1.0.0e
+ childSetEnabled("BtnOwner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
childSetEnabled("LabelOwnerTitle",TRUE);
childSetEnabled("LabelOwnerName",TRUE);
childSetText("LabelOwnerName",name);
@@ -606,6 +625,17 @@ void LLSidepanelItemInfo::onClickCreator()
if(!item) return;
if(!item->getCreatorUUID().isNull())
{
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Added: RLVa-1.2.1b
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ {
+ const LLPermissions& perm = item->getPermissions();
+ if ( ((perm.isOwned()) && (!perm.isGroupOwned()) && (perm.getOwner() == item->getCreatorUUID()) ) ||
+ (RlvHandler::isNearbyAgent(item->getCreatorUUID())) )
+ {
+ return;
+ }
+ }
+// [/RLVa:KB]
LLAvatarActions::showProfile(item->getCreatorUUID());
}
}
@@ -621,6 +651,10 @@ void LLSidepanelItemInfo::onClickOwner()
}
else
{
+// [RLVa:KB] - Checked: 2010-08-25 (RLVa-1.2.1b) | Modified: RLVa-1.0.0e
+ if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+ return;
+// [/RLVa:KB]
LLAvatarActions::showProfile(item->getPermissions().getOwner());
}
}
--
GitLab