Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Display additional metadata that LLVOAvatar now provides

Browse Source
This commit is contained in:
Hazim Gazov
2010-08-07 23:39:17 +00:00
parent f026ffaeca
commit 2f612dc1a2
3 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloateravatarlist.cpp
View File

@@ -776,18 +776,27 @@ void LLFloaterAvatarList::refreshAvatarList()
element["columns"][LIST_CLIENT]["column"] = "client"; element["columns"][LIST_CLIENT]["column"] = "client";
element["columns"][LIST_CLIENT]["type"] = "text"; element["columns"][LIST_CLIENT]["type"] = "text";
element["columns"][LIST_METADATA]["column"] = "metadata";
element["columns"][LIST_METADATA]["type"] = "text";
LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" ); LLColor4 avatar_name_color = gColors.getColor( "AvatarNameColor" );
std::string client; std::string client;
LLVOAvatar *avatarp = (LLVOAvatar*)gObjectList.findObject(av_id); LLVOAvatar *avatarp = (LLVOAvatar*)gObjectList.findObject(av_id);
if(avatarp) if(avatarp)
{ {
avatarp->getClientTag(client, avatar_name_color, TRUE); avatarp->getClientInfo(client, avatar_name_color, TRUE);
if(client == "") if(client == "")
{ {
avatar_name_color = gColors.getColor( "ScrollUnselectedColor" ); avatar_name_color = gColors.getColor( "ScrollUnselectedColor" );
client = "?"; client = "?";
} }
element["columns"][LIST_CLIENT]["value"] = client.c_str(); element["columns"][LIST_CLIENT]["value"] = client.c_str();
if(avatarp->extraMetadata.length())
{
element["columns"][LIST_METADATA]["value"] = avatarp->extraMetadata.c_str();
}
} }
else else
{ {

3
indra/newview/llfloateravatarlist.h
View File

@@ -201,7 +201,8 @@ private:
LIST_DISTANCE, LIST_DISTANCE,
LIST_POSITION, LIST_POSITION,
LIST_ALTITUDE, LIST_ALTITUDE,
LIST_CLIENT LIST_CLIENT,
LIST_METADATA
}; };
typedef void (*avlist_command_t)(const LLUUID &avatar, const std::string &name); typedef void (*avlist_command_t)(const LLUUID &avatar, const std::string &name);

3
indra/newview/skins/default/xui/en-us/floater_radar.xml
View File

@@ -9,11 +9,12 @@
draw_heading="true" multi_select="true" search_column="1" draw_heading="true" multi_select="true" search_column="1"
tool_tip="Hold shift or control while clicking to select multiple avatars"> tool_tip="Hold shift or control while clicking to select multiple avatars">
<column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/> <column name="marked" label="Mark" width="12" tool_tip="Marked avatars"/>
<column name="avatar_name" label="Name" dynamicwidth="true" tool_tip="Hold shift or control while clicking to select multiple avatars"/> <column name="avatar_name" label="Name" width="150" tool_tip="Hold shift or control while clicking to select multiple avatars"/>
<column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/> <column name="distance" label="Dist." width="48" tool_tip="Distance from your avatar (red=within chat range, yellow=within shout range, green=within draw distance)"/>
<column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/> <column name="position" label="Pos." width="60" tool_tip="Position (X, Y) within this sim, or general direction (cardinal point) for outside sims"/>
<column name="altitude" label="Alt." width="48" tool_tip="Altitude"/> <column name="altitude" label="Alt." width="48" tool_tip="Altitude"/>
<column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/> <column name="client" label="Client" width="80" dynamicwidth="true" tool_tip="Client the avatar is possibly using"/>
<column name="metadata" label="Metadata" width="80" dynamicwidth="true" tool_tip="Extra info we know about the avatar"/>
</scroll_list> </scroll_list>
<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false" <tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"