From 52aeaa32841e7d0b37abab0a2a2540c2be2f16b7 Mon Sep 17 00:00:00 2001
From: James Cook <james@lindenlab.com>
Date: Tue, 7 Jul 2009 00:53:05 +0000
Subject: Merge skinning-14 to viewer-2, including refactoring many floaters to
 register them with LLFloaterReg, support for introspection of ParamBlock
 based UI widgets to dump XML schema, splitting llfolderview.cpp into three
 separate files to unravel dependencies and skeleton for for LLListView
 widget.  Resolved conflicts in these files: lldraghandle.h, lluictrl.h,
 llchiclet.cpp, llfolderview.h/cpp, lliinventorybridge.cpp, llpanelpicks.cpp,
 llviewermenu.cpp, floater_mute.xml, floater_preferences.xml,
 notifications.xml, panel_preferences_audio.xml,
 panel_preferences_graphics1.xml, panel_region_general.xml svn merge
 -r124961:126284
 svn+ssh://svn.lindenlab.com/svn/linden/branches/skinning/skinning-14

---
 .../skins/default/xui/en/floater_im_session.xml    | 25 ++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_im_session.xml

(limited to 'indra/newview/skins/default/xui/en/floater_im_session.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
new file mode 100644
index 0000000000..7c95fcd96a
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+ background_visible="true"
+ follows="left|top|right|bottom"
+ height="200"
+ layout="topleft"
+ left="0"
+ name="panel_im"
+ top="0"
+ width="300">
+  <text_editor
+   enabled="false"
+   type="string"
+   length="1"
+   top="20" 
+   follows="left|top|right"
+   font="SansSerif"
+   height="175"
+   layout="topleft"
+   left="5"
+   name="im_text"
+   width="290"
+   word_wrap="true">
+  </text_editor>
+</floater>
-- 
cgit v1.2.3