From 67df523f1013e4e30a73976ad7c6a7aea33a9245 Mon Sep 17 00:00:00 2001
From: Shyotl <Shyotl@gmail.com>
Date: Sat, 22 Jun 2013 17:27:09 -0500
Subject: [PATCH] LLChatBar can't betreated as a LLPanel and a LLLayoutPanel at
 the same time. Demoted to just an LLPanel (fixes issues with follow
 attribute).

---
 indra/newview/llchatbar.cpp                           |  2 +-
 indra/newview/llchatbar.h                             |  3 +--
 .../skins/default/xui/en-us/panel_chat_bar.xml        |  2 +-
 .../skins/default/xui/en-us/panel_overlaybar.xml      | 11 +++++++----
 .../newview/skins/default/xui/es/panel_overlaybar.xml |  4 +++-
 .../newview/skins/default/xui/fr/panel_overlaybar.xml |  4 +++-
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp
index 2bdee1697..6fdd7d0f9 100644
--- a/indra/newview/llchatbar.cpp
+++ b/indra/newview/llchatbar.cpp
@@ -111,7 +111,7 @@ private:
 //
 
 LLChatBar::LLChatBar() 
-:	LLLayoutPanel(),
+:	LLPanel(),
 	mInputEditor(NULL),
 	mGestureLabelTimer(),
 	mLastSpecialChatChannel(0),
diff --git a/indra/newview/llchatbar.h b/indra/newview/llchatbar.h
index 1baa15afa..b031e312a 100644
--- a/indra/newview/llchatbar.h
+++ b/indra/newview/llchatbar.h
@@ -46,8 +46,7 @@ class LLFrameTimer;
 class LLChatBarGestureObserver;
 class LLComboBox;
 
-class LLChatBar
-:	public LLLayoutPanel
+class LLChatBar : public LLPanel
 {
 public:
 	// constructor for inline chat-bars (e.g. hosted in chat history window)
diff --git a/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml b/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
index 09c2914d1..f223ca2ba 100644
--- a/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_chat_bar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<panel bottom="-1" default_tab_group="1" follows="left|bottom|right" height="25"
+<panel bottom="0" default_tab_group="1" follows="left|bottom|right" height="25"
      left="0" name="chat_bar" width="395">
 	<panel bottom="1" follows="left|right|bottom" height="23" left="0"
 	     use_bounding_rect="true" width="397" bg_visible="false" border="false" border_visible="false">
diff --git a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
index c9687b8c6..4fb9d4d4a 100644
--- a/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
@@ -42,10 +42,13 @@
 					     label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
 					     scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
         </layout_panel>
-				<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
-				     filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
-				     min_height="24" mouse_opaque="false" name="chat_bar" user_resize="false"
-				     use_bounding_rect="true" width="395" />
+        <layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
+            follows="left|right|bottom" left="0" min_height="24" mouse_opaque="false" name="chat_bar_layout_panel" user_resize="false"
+            use_bounding_rect="true" width="395" >
+                <panel name="chat_bar" filename="panel_chat_bar.xml" width="395" mouse_opaque="false"
+                    bottom="0" default_tab_group="1" follows="left|bottom|right" height="25"
+                    left="0"/>
+        </layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel auto_resize="false" bottom="0" left="0" min_width="96" mouse_opaque="false"
diff --git a/indra/newview/skins/default/xui/es/panel_overlaybar.xml b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
index 119f3734f..db5f4c031 100644
--- a/indra/newview/skins/default/xui/es/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/es/panel_overlaybar.xml
@@ -12,7 +12,9 @@
 					<button label="Pararse" label_selected="Pararse" name="Stand Up" tool_tip="Pulsa aquí para pararte"/>
 					<button label="Cancelar TP" label_selected="Cancelar TP" name="Cancel TP" tool_tip="Pulsa aquí para cancerla el proceso de teleporte actual"/>
 				</layout_panel>
-				<layout_panel name="chat_bar"/>
+				<layout_panel name="chat_bar_layout_panel">
+          <panel name="chat_bar"/>
+        </layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel name="ao_remote_container">
diff --git a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
index f2db15421..b2788d9b5 100644
--- a/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
+++ b/indra/newview/skins/default/xui/fr/panel_overlaybar.xml
@@ -15,7 +15,9 @@
 					     tool_tip="Im en attente."
 					     width="150" />
 				</layout_panel>
-				<layout_panel name="chat_bar"/>
+        <layout_panel name="chat_bar_layout_panel">
+          <panel name="chat_bar"/>
+        </layout_panel>
 			</layout_stack>
 		</layout_panel>
 		<layout_panel min_width="220" name="media_remote_container" width="220"/>