summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorRichard Nelson <none@none>2010-10-04 18:38:38 -0700
committerRichard Nelson <none@none>2010-10-04 18:38:38 -0700
commit5e0e86869dcb0c365c486776f8dacba14a029d1e (patch)
tree99330b5d0b24155a8b4282bed0b8d8ad15ef938f /indra
parent35ed07f66381f74e7ce58947c33b61614ffe52e0 (diff)
EXP-138 WIP Chat and IM notices not aligned with Bottom bar in Skylight Viewer
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llnearbychathandler.cpp7
1 files changed, 6 insertions, 1 deletions
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