1 files changed, 30 insertions, 3 deletions

diff --git a/linden/indra/newview/llfloaterobjectiminfo.cpp b/linden/indra/newview/llfloaterobjectiminfo.cpp
index 7ef3af2..fa7964c 100644
--- a/linden/indra/newview/llfloaterobjectiminfo.cpp
+++ b/linden/indra/newview/llfloaterobjectiminfo.cpp
@@ -47,6 +47,10 @@
 #include "llurldispatcher.h"
 #include "llviewercontrol.h"
 
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-0.2.0g
+#include "rlvhandler.h"
+// [/RLVa:KB]
+
 ////////////////////////////////////////////////////////////////////////////
 // LLFloaterObjectIMInfo
 class LLFloaterObjectIMInfo : public LLFloater, public LLFloaterSingleton<LLFloaterObjectIMInfo>
@@ -100,7 +104,10 @@ void LLFloaterObjectIMInfo::update(const LLUUID& object_id, const std::string& n
 {
         // When talking to an old region we won't have a slurl.
         // The object id isn't really the object id either but we don't use it so who cares.
-        bool have_slurl = !slurl.empty();
+        //bool have_slurl = !slurl.empty();
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-04 (RLVa-1.0.0a) | Added: RLVa-0.2.0g
+        bool have_slurl = (!slurl.empty()) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC));
+// [/RLVa:KB]
         childSetVisible("Unknown_Slurl",!have_slurl);
         childSetVisible("Slurl",have_slurl);
 
@@ -108,7 +115,10 @@ void LLFloaterObjectIMInfo::update(const LLUUID& object_id, const std::string& n
         childSetText("Slurl",slurl);
         childSetText("OwnerName",std::string(""));
 
-        bool my_object = (owner_id == gAgentID);
+//      bool my_object = (owner_id == gAgentID);
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0g
+        bool my_object = (owner_id == gAgentID) || ((gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(owner_id)));
+// [/RLVa:KB]
         childSetEnabled("Mute",!my_object);
         
         mObjectID = object_id;
@@ -139,7 +149,10 @@ void LLFloaterObjectIMInfo::onClickOwner(void* data)
         {
                 LLFloaterGroupInfo::showFromUUID(self->mOwnerID);
         }
-        else
+//      else
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0g
+        else if ( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) || (!gRlvHandler.isAgentNearby(self->mOwnerID)) )
+// [/RLVa:KB]
         {
                 LLFloaterAvatarInfo::showFromObject(self->mOwnerID);
         }
@@ -151,6 +164,13 @@ void LLFloaterObjectIMInfo::onClickMute(void* data)
         LLFloaterObjectIMInfo* self = (LLFloaterObjectIMInfo*)data;
 
         LLMute::EType mute_type = (self->mOwnerIsGroup) ? LLMute::GROUP : LLMute::AGENT;
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0g
+        if ( (LLMute::GROUP != mute_type) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(self->mOwnerID)) )
+        {
+                return;
+        }
+// [/RLVa:KB]
+
         LLMute mute(self->mOwnerID, self->mOwnerName, mute_type);
         LLMuteList::getInstance()->add(mute);
         LLFloaterMute::showInstance();
@@ -167,6 +187,13 @@ void LLFloaterObjectIMInfo::nameCallback(const LLUUID& id, const std::string& fi
                 self->mOwnerName += " " + last;
         }
 
+// [RLVa:KB] - Version: 1.23.4 | Checked: 2009-07-08 (RLVa-1.0.0e) | Added: RLVa-0.2.0g
+        if ( (!is_group) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) && (gRlvHandler.isAgentNearby(id)) )
+        {
+                self->mOwnerName = gRlvHandler.getAnonym(self->mOwnerName);
+        }
+// [/RLVa:KB]
+
         self->childSetText("OwnerName",self->mOwnerName);
 }