Applied RLVa-1.0.5e_fix.patch by Kitty Barnett to fix RLVa up to 1.0.5.e

1 files changed, 6 insertions, 5 deletions

diff --git a/linden/indra/newview/panelradar.cpp b/linden/indra/newview/panelradar.cpp
index c5fc3db..b323a77 100644
--- a/linden/indra/newview/panelradar.cpp
+++ b/linden/indra/newview/panelradar.cpp
@@ -47,6 +47,7 @@
 #include "llscrolllistctrl.h"
 #include "lltracker.h"
 #include "lluictrlfactory.h"
+#include "llviewercontrol.h"
 #include "llviewerobjectlist.h"
 #include "llviewermenu.h"
 #include "llviewermessage.h"
@@ -291,12 +292,12 @@ void PanelRadar::updateRadarDisplay()
                         element["id"] = entry->getID();
                         element["columns"][0]["column"] = "avatar_name";
                         element["columns"][0]["type"] = "text";
+//                      element["columns"][0]["value"] = typing + entry->getName() + " " + mute_text;
 // [RLVa:KB] - Alternate: Imprudence-1.2.0
-                        //element["columns"][0]["value"] = typing + entry->getName() + " " + mute_text;
-                        std::string fullname = (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? 
-                                                                                gRlvHandler.getAnonym(fullname) : 
-                                                                                typing + entry->getName() + " " + mute_text;
-                        element["columns"][0]["value"] = fullname;
+                        element["columns"][0]["value"] =
+                                (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
+                                        ? gRlvHandler.getAnonym(entry->getName())
+                                        : typing + entry->getName() + " " + mute_text;
 // [/RLVa:KB]
                         element["columns"][1]["column"] = "avatar_distance";
                         element["columns"][1]["type"] = "text";