diff options
| author | simon <none@none> | 2014-03-19 11:41:42 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-03-19 11:41:42 -0700 |
| commit | 00a325ccb90b1c6800ec78e1211b5097d9c27a58 (patch) | |
| tree | 8b58fbd99d5bce117cf8dad5181b5690af4bd34f /indra/newview/llfloatertools.cpp | |
| parent | 09d1c27d4f78c78d949b6a3d896d6f58df2dfc06 (diff) | |
| parent | 1ab9f19f82a84a109cf429998f423986268801f6 (diff) | |
Pull in viewer-lion to lock down next release
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
| -rwxr-xr-x | indra/newview/llfloatertools.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp index 7b25291da7..802544089c 100755 --- a/indra/newview/llfloatertools.cpp +++ b/indra/newview/llfloatertools.cpp @@ -1069,9 +1069,9 @@ void LLFloaterTools::setGridMode(S32 mode) void LLFloaterTools::onClickGridOptions() { - LLFloaterReg::showInstance("build_options"); - // RN: this makes grid options dependent on build tools window - //floaterp->addDependentFloater(LLFloaterBuildOptions::getInstance(), FALSE); + LLFloater* floaterp = LLFloaterReg::showInstance("build_options"); + // position floater next to build tools, not over + floaterp->setRect(gFloaterView->findNeighboringPosition(this, floaterp)); } // static |