diff options
author | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
---|---|---|
committer | Graham Linden <none@none> | 2014-07-31 08:40:57 -0700 |
commit | db43a0560c259623a1a8022668f8482d82cae9c8 (patch) | |
tree | 31e532720212ed1697897d6c2694fe991cb8f812 /indra/newview/llfloatertools.cpp | |
parent | 76e7f978c157f9921593ea0e43f642cb9de4703d (diff) | |
parent | 532433674c9553636af9ea8d433b9da6d6fae587 (diff) |
Merge viewer-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 afbd7ba5e2..bd5d2207b4 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 |