livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merging in Ansariel's fix/merge snipe.

Liny 2012-03-02 17:30:05 -08:00
parent b7628c85d7 d6ce9809f6
commit f7b6706747
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
indra/newview/llsyswellwindow.cpp
View File

@ -147,9 +147,23 @@ void LLSysWellWindow::setVisible(BOOL visible)
{
if (NULL == getDockControl() && getDockTongue().notNull())
{
setDockControl(new LLDockControl(
LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
getDockTongue(), LLDockControl::BOTTOM));
// <FS:Ansariel> Group notices, IMs and chiclets position
//setDockControl(new LLDockControl(
// LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
// getDockTongue(), LLDockControl::BOTTOM));
if (gSavedSettings.getBOOL("InternalShowGroupNoticesTopRight"))
{
setDockControl(new LLDockControl(
LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
getDockTongue(), LLDockControl::BOTTOM));
}
else
{
setDockControl(new LLDockControl(
LLChicletBar::getInstance()->getChild<LLView>(getAnchorViewName()), this,
getDockTongue(), LLDockControl::TOP));
}
// </FS:Ansariel> Group notices, IMs and chiclets position
}
}