From bf1f2c4f136fc3d7765573dca0d3dda90f3ac400 Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Thu, 20 Mar 2014 10:43:47 +0100
Subject: [PATCH] Sound Explorer: Fix sound owner not properly being shown if
 name is not in cache; The group-owned didn't work anyway unless somewhere
 else in the code the name for this group has been requested explictly

---
 indra/newview/NACLfloaterexploresounds.cpp         | 14 ++++----------
 .../default/xui/de/floater_NACL_explore_sounds.xml |  3 ---
 .../default/xui/en/floater_NACL_explore_sounds.xml |  3 ---
 .../default/xui/es/floater_NACL_explore_sounds.xml |  3 ---
 .../default/xui/pl/floater_NACL_explore_sounds.xml |  3 ---
 5 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/indra/newview/NACLfloaterexploresounds.cpp b/indra/newview/NACLfloaterexploresounds.cpp
index 750c283329..cdcc714d3b 100644
--- a/indra/newview/NACLfloaterexploresounds.cpp
+++ b/indra/newview/NACLfloaterexploresounds.cpp
@@ -8,6 +8,7 @@
 #include "llscrolllistctrl.h"
 #include "llagent.h"
 #include "llagentcamera.h"
+#include "llavatarnamecache.h"
 #include "llviewerobjectlist.h"
 #include "llviewerregion.h"
 #include "fswsassetblacklist.h"
@@ -245,17 +246,10 @@ BOOL NACLFloaterExploreSounds::tick()
 
 		LLSD& owner_column = element["columns"][2];
 		owner_column["column"] = "owner";
-		std::string fullname;
-		BOOL is_group;
-		if(gCacheName->getIfThere(item.mOwnerID, fullname, is_group))
+		LLAvatarName av_name;
+		if (LLAvatarNameCache::get(item.mOwnerID, &av_name))
 		{
-			if (is_group)
-			{
-				LLStringUtil::format_map_t format_args;
-				format_args["NAME"] = fullname;
-				fullname = getString("GroupOwned", format_args);
-			}
-			owner_column["value"] = fullname;
+			owner_column["value"] = av_name.getCompleteName();
 		}
 		else
 		{
diff --git a/indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml
index 37e195273e..4170583460 100644
--- a/indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml
@@ -21,9 +21,6 @@
 	<floater.string name="Type_llPlaySound">
 		llPlaySound
 	</floater.string>
-	<floater.string name="GroupOwned">
-		[NAME] (Gruppe)
-	</floater.string>
 	<check_box name="avatars_chk" label="Avatare"/>
 	<check_box name="objects_chk" label="Objekte"/>
 	<check_box name="collision_chk" label="Standard-Kollisionssounds"/>
diff --git a/indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml
index 5318c58c70..17409425bb 100644
--- a/indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml
@@ -35,9 +35,6 @@
 	<floater.string name="Type_llPlaySound">
 		llPlaySound
 	</floater.string>
-	<floater.string name="GroupOwned">
-		[NAME] (Group)
-	</floater.string>
 	<check_box follows="top|left" bottom_delta="20" left="5" width="64" name="avatars_chk" label="Avatars" control_name="FloaterSoundsLogAvatars" />
 	<check_box follows="top|left" bottom_delta="0" left_delta="64" width="64" name="objects_chk" label="Objects" initial_value="true" control_name="FloaterSoundsLogObjects" />
 	<check_box follows="top|left" bottom_delta="0" left_delta="64" width="160" name="collision_chk" label="Default Collision Sounds" control_name="FloaterSoundsLogCollisions" />
diff --git a/indra/newview/skins/default/xui/es/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/es/floater_NACL_explore_sounds.xml
index 2bca305e11..008b8f9b92 100644
--- a/indra/newview/skins/default/xui/es/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/es/floater_NACL_explore_sounds.xml
@@ -9,9 +9,6 @@
 	<floater.string name="Type_UI">
 		Interfaz
 	</floater.string>
-	<floater.string name="GroupOwned">
-		[NAME] (Grupo)
-	</floater.string>
 	<check_box name="avatars_chk" label="Avatares" width="75"/>
 	<check_box name="objects_chk" label="Objetos" width="69" left_delta="75"/>
 	<check_box name="collision_chk" label="Sonidos de colisión por defecto" width="194" left_delta="69"/>
diff --git a/indra/newview/skins/default/xui/pl/floater_NACL_explore_sounds.xml b/indra/newview/skins/default/xui/pl/floater_NACL_explore_sounds.xml
index 1ffd7cb7e0..a4c2fb4210 100644
--- a/indra/newview/skins/default/xui/pl/floater_NACL_explore_sounds.xml
+++ b/indra/newview/skins/default/xui/pl/floater_NACL_explore_sounds.xml
@@ -12,9 +12,6 @@
 	<floater.string name="Type_Avatar">
 		Awatar
 	</floater.string>
-	<floater.string name="GroupOwned">
-		[NAME] (Grupa)
-	</floater.string>
 	<check_box name="avatars_chk" label="Awatary" />
 	<check_box name="objects_chk" label="Obiekty" />
 	<check_box name="collision_chk" label="Domyślne dźwięki kolizji" />