diff --git a/indra/newview/llfloateravatarlist.cpp b/indra/newview/llfloateravatarlist.cpp
index 74c144e6e..76964f4ed 100644
--- a/indra/newview/llfloateravatarlist.cpp
+++ b/indra/newview/llfloateravatarlist.cpp
@@ -776,18 +776,27 @@ void LLFloaterAvatarList::refreshAvatarList()
 		
 		element["columns"][LIST_CLIENT]["column"] = "client";
 		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" );
 		std::string client;
 		LLVOAvatar *avatarp = (LLVOAvatar*)gObjectList.findObject(av_id);
 		if(avatarp)
 		{
-			avatarp->getClientTag(client, avatar_name_color, TRUE);
+			avatarp->getClientInfo(client, avatar_name_color, TRUE);
 			if(client == "")
 			{
 				avatar_name_color = gColors.getColor( "ScrollUnselectedColor" );
 				client = "?";
 			}
 			element["columns"][LIST_CLIENT]["value"] = client.c_str();
+
+			if(avatarp->extraMetadata.length())
+			{
+				element["columns"][LIST_METADATA]["value"] = avatarp->extraMetadata.c_str();
+			}
 		}
 		else
 		{
diff --git a/indra/newview/llfloateravatarlist.h b/indra/newview/llfloateravatarlist.h
index 0c533f60b..28d14aa7c 100644
--- a/indra/newview/llfloateravatarlist.h
+++ b/indra/newview/llfloateravatarlist.h
@@ -201,7 +201,8 @@ private:
 		LIST_DISTANCE,
 		LIST_POSITION,
 		LIST_ALTITUDE,
-		LIST_CLIENT
+		LIST_CLIENT,
+		LIST_METADATA
 	};
 
 	typedef void (*avlist_command_t)(const LLUUID &avatar, const std::string &name);
diff --git a/indra/newview/skins/default/xui/en-us/floater_radar.xml b/indra/newview/skins/default/xui/en-us/floater_radar.xml
index 5a9e92f97..09a12e711 100644
--- a/indra/newview/skins/default/xui/en-us/floater_radar.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_radar.xml
@@ -9,11 +9,12 @@
 		    draw_heading="true" multi_select="true" search_column="1"
 		    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="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="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="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>
 
 	<tab_container border="false" bottom_delta="-130" height="120" left="6" mouse_opaque="false"