From b3968a6f11d5d54a5d6498557565656cd69550ca Mon Sep 17 00:00:00 2001
From: Ansariel <none@none>
Date: Mon, 27 Feb 2012 13:00:06 +0100
Subject: [PATCH] Fixed chat console floating behing chatbar in Vintage skin
 (FIRE-5266)

---
 indra/newview/llviewerwindow.cpp | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 35b2cb7b02..29e7c93f5f 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -5136,8 +5136,19 @@ S32 LLViewerWindow::getChatConsoleBottomPad()
 {
 	S32 offset = 0;
 
+	// <FS:Ansariel> Fixed chat console offset for Vintage skin (FIRE-5266)
+	//if(gToolBarView)
+		//offset += gToolBarView->getChild<LLView>("bottom_toolbar_panel")->getRect().getHeight();
 	if(gToolBarView)
+	{
 		offset += gToolBarView->getChild<LLView>("bottom_toolbar_panel")->getRect().getHeight();
+		LLView* chat_stack = gToolBarView->getChild<LLView>("bottom_chat_stack");
+		if (chat_stack)
+		{
+			offset = chat_stack->getRect().getHeight();
+		}
+	}
+	// </FS:Ansariel>
 
 	return offset;
 }