From 5e0e86869dcb0c365c486776f8dacba14a029d1e Mon Sep 17 00:00:00 2001
From: Richard Nelson <none@none>
Date: Mon, 4 Oct 2010 18:38:38 -0700
Subject: EXP-138 WIP Chat and IM notices not aligned with Bottom bar in
 Skylight Viewer

---
 indra/newview/llnearbychathandler.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'indra')

diff --git a/indra/newview/llnearbychathandler.cpp b/indra/newview/llnearbychathandler.cpp
index 47d32e57fb..f06f4eab28 100644
--- a/indra/newview/llnearbychathandler.cpp
+++ b/indra/newview/llnearbychathandler.cpp
@@ -336,7 +336,12 @@ void LLNearbyChatScreenChannel::showToastsBottom()
 		return;
 
 	LLRect	toast_rect;	
-	S32		bottom = getRect().mBottom;
+	S32 channel_bottom = gViewerWindow->getWorldViewRectScaled().mBottom + gSavedSettings.getS32("ChannelBottomPanelMargin");
+	LLRect cur_rect = getRect();
+	cur_rect.translate(0, channel_bottom - cur_rect.mBottom);
+	setRect(cur_rect);
+
+	S32		bottom = channel_bottom;
 	S32		margin = gSavedSettings.getS32("ToastGap");
 
 	//sort active toasts
-- 
cgit v1.2.3