1 files changed, 22 insertions, 2 deletions

diff --git a/linden/indra/newview/llfloaterinspect.cpp b/linden/indra/newview/llfloaterinspect.cpp
index e1d3c4a..2367b48 100644
--- a/linden/indra/newview/llfloaterinspect.cpp
+++ b/linden/indra/newview/llfloaterinspect.cpp
@@ -42,6 +42,10 @@
 #include "llviewerobject.h"
 #include "lluictrlfactory.h"
 
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 LLFloaterInspect* LLFloaterInspect::sInstance = NULL;
 
 LLFloaterInspect::LLFloaterInspect(void) :
@@ -145,7 +149,13 @@ void LLFloaterInspect::onClickOwnerProfile(void* ctrl)
                 if(node)
                 {
                         const LLUUID& owner_id = node->mPermissions->getOwner();
-                        LLFloaterAvatarInfo::showFromDirectory(owner_id);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                        if (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                        {
+                                LLFloaterAvatarInfo::showFromDirectory(owner_id);
+                        }
+// [/RLVa:KB]
+//                      LLFloaterAvatarInfo::showFromDirectory(owner_id);
                 }
         }
 }
@@ -163,7 +173,10 @@ void LLFloaterInspect::onSelectObject(LLUICtrl* ctrl, void* user_data)
 {
         if(LLFloaterInspect::getSelectedUUID() != LLUUID::null)
         {
-                sInstance->childSetEnabled("button owner", true);
+                //sInstance->childSetEnabled("button owner", true);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-1.0.0e
+                sInstance->childSetEnabled("button owner", !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
+// [/RLVa:KB]
                 sInstance->childSetEnabled("button creator", true);
         }
 }
@@ -223,6 +236,13 @@ void LLFloaterInspect::refresh()
                 LLStringUtil::copy(time, ctime(&timestamp), MAX_STRING);
                 time[24] = '\0';
                 gCacheName->getFullName(obj->mPermissions->getOwner(), owner_name);
+// [RLVa:KB] - Checked: 2009-07-08 (RLVa-1.0.0e)
+                if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                {
+                        // TODO-RLVa: shouldn't filter if this is a group-owned prim (will show "(nobody)")
+                        owner_name = gRlvHandler.getAnonym(owner_name);
+                }
+// [/RLVa:KB]
                 gCacheName->getFullName(obj->mPermissions->getCreator(), creator_name);
                 row["id"] = obj->getObject()->getID();
                 row["columns"][0]["column"] = "object_name";