From d11f542ffefdc5db845028d5a260b5b0ad12dea6 Mon Sep 17 00:00:00 2001
From: Seth ProductEngine <slitovchuk@productengine.com>
Date: Thu, 7 Jun 2012 00:59:05 +0300
Subject: CHUI-120 WIP Added starting ad hoc conference in the same floater as
 P2P chat, after adding more participants. - Added a parameter to
 LLAvatarActions::startConference() and LLIMMgr::addSession() to pass the uuid
 of a P2P IM floater which should be used to start a new conference in it. -
 In LLChicletBar::sessionRemoved() we don't close the IM floater if it is
 going to be re-used for a new conference.

---
 indra/newview/skins/default/xui/en/floater_im_session.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'indra/newview/skins/default')

diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index beeb4eea9b..fc5b6b10af 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -69,8 +69,7 @@
                  top="5"
                  left_pad="4"
                  name="add_btn"
-                 width="31">
-             </button>   
+                 width="31"/>
              <button
                  follows="top|left"
                  height="25"
@@ -82,8 +81,7 @@
                  top="5"
                  left_pad="4"
                  name="voice_call_btn"
-                 width="31">
-             </button>
+                 width="31"/>
              <button
                  follows="right|top"
                  height="25"
-- 
cgit v1.2.3