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

Cleared open merge issue in llscriptfloater.cpp: The bottom tray is dead and gone

Ansariel 2012-05-18 17:56:13 +02:00
parent 2cc4ecdcfc
commit e702838d56
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llscriptfloater.cpp
View File

@ -140,14 +140,9 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
S32 width=pos.getWidth();
S32 height=pos.getHeight();
// ND_MERGE LLBottomTray is gone
// pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
// LLBottomTray::instance().getRect().getHeight(),
// width,height);
pos.setOriginAndSize(gViewerWindow->getWorldViewWidthScaled()-width,
gViewerWindow->getWorldViewHeightScaled()-height,
width,height);
// /ND_MERGE
floater->setRect(pos);
floater->savePosition();