merge

1 files changed, 0 insertions, 182 deletions

diff --git a/indra/newview/skins/default/xui/en/inspect_avatar.xml b/indra/newview/skins/default/xui/en/inspect_avatar.xml
deleted file mode 100644
index 194ae151d2..0000000000
--- a/indra/newview/skins/default/xui/en/inspect_avatar.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<!--
-  Not can_close / no title to avoid window chrome
-  Single instance - only have one at a time, recycle it each spawn
--->
-<floater
- legacy_header_height="25"
- bevel_style="in"
- bg_opaque_image="Inspector_Background"
- can_close="false"
- can_minimize="false"
- height="148"
- layout="topleft"
- name="inspect_avatar"
- single_instance="true"
- sound_flags="0"
- visible="true"
- width="228">
-  <!-- Allowed fields include:
-	[BORN_ON] ("12/3/2008")
-	[SL_PROFILE] (Second Life profile),
-    [RW_PROFILE] (real world profile),
-	[ACCTTYPE] ("Resident"),
-	[PAYMENTINFO] ("Payment Info on File"),
-	[AGE] ("1 year 2 months")
-   -->
-  <string
-   name="Subtitle">
-[AGE]
-  </string>
-  <string
-     name="Details">
-[SL_PROFILE]
-    </string>
-  <text
-     follows="top|left"
-     font="SansSerifLarge"
-     height="16"
-     left="8"
-     name="user_name"
-     top="10"
-     text_color="White"
-     use_ellipses="true"
-     value="Grumpity ProductEngine"
-     width="175" />
-    <text
-     follows="top|left"
-     height="16"
-     left="8"
-     name="user_subtitle"
-     font="SansSerifSmall"
-     text_color="White"
-     value="11 Months, 3 days old"
-     width="175"
-     use_ellipses="true" />
-     <text
-     follows="left|top|right"
-     height="35"
-     left="8"
-     name="user_details"
-     right="-10"
-     word_wrap="true"
-     top_pad="6"
-     use_ellipses="true"
-     width="220">This is my second life description and I really think it is great.
-    </text>
-    <slider
-     follows="top|left"
-     height="23"
-     increment="0.01"
-     left="1"
-     max_val="0.95"
-     min_val="0.05"
-     name="volume_slider"
-     show_text="false"
-     tool_tip="Voice volume"
-     top_pad="0"
-     value="0.5"
-     width="195" />
-    <button
-     follows="top|left"
-     height="16"
-     image_disabled="Audio_Off"
-     image_disabled_selected="AudioMute_Off"
-     image_hover_selected="AudioMute_Over"
-     image_selected="AudioMute_Off"
-     image_unselected="Audio_Off"
-     is_toggle="true"
-     left_pad="0"
-     top_delta="4"
-     name="mute_btn"
-     width="16" />
-    <avatar_icon
-     follows="top|left"
-     height="38"
-     right="-10"
-     bevel_style="in"
-     border_style="line"
-     mouse_opaque="true"
-     name="avatar_icon"
-     top="10"
-     width="38" />
-<!-- Overlapping buttons for default actions
-    llinspectavatar.cpp makes visible the most likely default action 
--->
-    <button
-     follows="top|left"
-     height="20"
-     label="Add Friend"
-     left="8"
-     top="119"
-     name="add_friend_btn"
-     width="90" />
-    <button
-     follows="top|left"
-     height="20"
-     label="IM"
-     left_delta="0"
-     top_delta="0"
-     name="im_btn"
-     width="80"
-     commit_callback.function="InspectAvatar.IM"/>
-	<button
-     follows="top|left"
-     height="20"
-     label="Profile"
-     layout="topleft"
-     name="view_profile_btn"
-     left_delta="96"
-     top_delta="0"
-     tab_stop="false"
-     width="80" />
-      <!--  gear buttons here -->
-  <menu_button
-     follows="top|left"
-     height="20"
-     layout="topleft"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_avatar_gear.xml"
-     name="gear_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-	<menu_button
-     follows="top|left"
-     height="20"
-     image_overlay="OptionsMenu_Off"
-     menu_filename="menu_inspect_self_gear.xml"
-     name="gear_self_btn"
-     right="-5"
-     top_delta="0"
-     width="35" />
-  <panel 
-    follows="top|left" 
-    top="148" 
-    left="0" 
-    height="60" 
-    width="228" 
-    visible="false"
-    background_visible="true"
-    name="moderator_panel"
-    background_opaque="true" 
-    bg_opaque_color="MouseGray">
-    <button
-      name="disable_voice"
-      label="Disable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      commit_callback.function="InspectAvatar.DisableVoice"/>
-    <button
-      name="enable_voice"
-      label="Enable Voice"
-      top="20"
-      width="95"
-      height="20"
-      left="10"
-      visible="false" 
-      commit_callback.function="InspectAvatar.EnableVoice"/>
-  </panel>
-</floater>