From d6ce9809f66c59d8a1a68733909c5ea423fe7999 Mon Sep 17 00:00:00 2001 From: Ansariel Date: Sat, 3 Mar 2012 02:22:46 +0100 Subject: [PATCH] Fixed syswell floater to respect chiclet bar position (FIRE-5301) --- indra/newview/llsyswellwindow.cpp | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 374f4c69c0..bb7cacb6fa 100644 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -147,9 +147,23 @@ void LLSysWellWindow::setVisible(BOOL visible) { if (NULL == getDockControl() && getDockTongue().notNull()) { - setDockControl(new LLDockControl( - LLChicletBar::getInstance()->getChild(getAnchorViewName()), this, - getDockTongue(), LLDockControl::BOTTOM)); + // Group notices, IMs and chiclets position + //setDockControl(new LLDockControl( + // LLChicletBar::getInstance()->getChild(getAnchorViewName()), this, + // getDockTongue(), LLDockControl::BOTTOM)); + if (gSavedSettings.getBOOL("InternalShowGroupNoticesTopRight")) + { + setDockControl(new LLDockControl( + LLChicletBar::getInstance()->getChild(getAnchorViewName()), this, + getDockTongue(), LLDockControl::BOTTOM)); + } + else + { + setDockControl(new LLDockControl( + LLChicletBar::getInstance()->getChild(getAnchorViewName()), this, + getDockTongue(), LLDockControl::TOP)); + } + // Group notices, IMs and chiclets position } }