Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience

1 files changed, 0 insertions, 194 deletions

diff --git a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml b/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
deleted file mode 100644
index 2cb77bcdf3..0000000000
--- a/indra/newview/skins/minimal/xui/en/panel_im_control_panel.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- border="false"
- height="300"
- name="panel_im_control_panel"
- width="150">
-    <avatar_icon
-     follows="left|top"
-     height="105"
-     left_delta="20"
-     name="avatar_icon"
-     top="-5"
-     width="114"/>
-    <layout_stack
-     mouse_opaque="false"
-     border_size="0"
-     clip="false"
-     follows="all"
-     height="183"
-     layout="topleft"
-     left="5"
-     name="button_stack"
-     orientation="vertical"
-     top_pad="5"
-     width="145">
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="20"
-         layout="topleft"
-         left="2"
-         min_height="20"
-         width="140"
-         name="view_profile_btn_panel"
-         top="0"
-         user_resize="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Profile"
-             name="view_profile_btn"
-             top="0"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="add_friend_btn_panel"
-         user_resize="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Add Friend"
-             name="add_friend_btn"
-             top="5"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="teleport_btn_panel"
-         user_resize="false">
-            <button
-                 auto_resize="false"
-                 follows="left|top|right"
-                 height="23"
-                 label="Teleport"
-                 name="teleport_btn"
-                 tool_tip = "Offer to teleport this person"
-                 width="140" />
-        </layout_panel>
-        <layout_panel
-           auto_resize="false"
-           follows="top|left|right"
-           height="25"
-           layout="topleft"
-           min_height="25"
-           width="140"
-           name="call_btn_panel"
-           user_resize="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Call"
-             name="call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="end_call_btn_panel"
-         user_resize="false"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="End Call"
-             name="end_call_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="block_btn_panel"
-         user_resize="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Block"
-             name="block_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="25"
-         width="140"
-         name="unblock_btn_panel"
-         user_resize="false"
-         visible="false">
-            <button
-             follows="left|top|right"
-             height="23"
-             label="Unblock"
-             name="unblock_btn"
-             width="140" />
-        </layout_panel>
-        <layout_panel
-         auto_resize="false"
-         follows="top|left|right"
-         height="25"
-         layout="topleft"
-         min_height="54"
-         width="140"
-         name="volume_ctrl_panel"
-         visible="false" 
-         user_resize="false">
-            <slider
-             follows="top|left"
-             height="23"
-             increment="0.01"
-             left="0"
-             max_val="0.95"
-             min_val="0.05"
-             name="volume_slider"
-             show_text="false"
-             tool_tip="Call Volume"
-             top_pad="32"
-             value="0.5"
-             width="125" />
-            <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" />
-        </layout_panel>
-        <layout_panel
-         mouse_opaque="false"
-         auto_resize="true"
-         follows="top|left"
-         height="0"
-         layout="topleft"
-         min_height="0"
-         width="140"
-         name="spacer"
-         user_resize="false" />
-    </layout_stack>
-</panel>