merge

1 files changed, 0 insertions, 98 deletions

diff --git a/indra/newview/skins/default/xui/en/panel_instant_message.xml b/indra/newview/skins/default/xui/en/panel_instant_message.xml
deleted file mode 100644
index 34fd3352a3..0000000000
--- a/indra/newview/skins/default/xui/en/panel_instant_message.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel
- background_visible="true"
- height="152"
- label="im_panel"
- layout="topleft"
- left="0"
- name="im_panel"
- top="0"
- width="305">
-    <string
-     name="message_max_lines_count">
-        6
-    </string>
-    <panel
-     background_visible="true"
-     bevel_style="in"
-     bg_alpha_color="black"
-     follows="top"
-     height="24"
-     label="im_header"
-     layout="topleft"
-     left="5"
-     mouse_opaque="false"
-     name="im_header"
-     top="5"
-     width="295">
-        <avatar_icon
-         follows="right"
-         height="18"
-         image_name="Generic_Person"
-         layout="topleft"
-         left="3"
-         mouse_opaque="false"
-         name="avatar_icon"
-         top="3"
-         width="18" />
-        <group_icon
-         follows="right"
-         height="18"
-         default_icon_name="Generic_Group"
-         layout="topleft"
-         left="3"
-         mouse_opaque="false"
-         name="group_icon"
-         top="3"
-         width="18" />
-        <avatar_icon
-         color="Green"
-         follows="right"
-         height="18"
-         image_name="Generic_Person"
-         layout="topleft"
-         left="3"
-         mouse_opaque="false"
-         name="adhoc_icon"
-         top="3"
-         width="18" />
-        <text
-         follows="left|right"
-         font.style="BOLD"
-         height="12"
-         layout="topleft"
-         left_pad="5"
-         name="user_name"
-         text_color="white"
-         top="8"
-         use_ellipses="true"
-         value="Erica Vader"
-         width="212" />
-	 <!-- TIME STAMP -->
-        <text
-        font="SansSerifSmall"
-         follows="right"
-         height="13"
-         layout="topleft"
-	 halign="right"
-         right="-5"
-         name="time_box"
-         top="8"
-         value="23:30"
-         width="50" />
-    </panel>
-    <text
-        font="SansSerifSmall"
-     follows="all"
-     height="97"
-     layout="topleft"
-     left="10"
-     name="message"
-     text_color="white"
-     top="33"
-     use_ellipses="true"
-     value=""
-     width="285"
-     word_wrap="true"
-     max_length="350" />
-</panel>