livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Ansariel 2014-03-20 10:43:47 +01:00
parent 38de78712b
commit bf1f2c4f13
5 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
indra/newview/NACLfloaterexploresounds.cpp
View File

@ -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
{

3
indra/newview/skins/default/xui/de/floater_NACL_explore_sounds.xml
View File

@ -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"/>

3
indra/newview/skins/default/xui/en/floater_NACL_explore_sounds.xml
View File

@ -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" />

3
indra/newview/skins/default/xui/es/floater_NACL_explore_sounds.xml
View File

@ -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"/>

3
indra/newview/skins/default/xui/pl/floater_NACL_explore_sounds.xml
View File

@ -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" />