summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2014-07-09 14:32:46 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2014-07-09 14:32:46 -0400
commitff3827f278d2d53f565bc585edc4db5bc5e5dc38 (patch)
tree87ba73e79aeb4af20816755f4226acdb942280c6 /indra/newview/llfloatertools.cpp
parentbfb9fc85b9c8b59d5cddced665d8be2e6907b455 (diff)
parent3e6698073cedc8b24068147cf6b7091f081ea125 (diff)
merge
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rwxr-xr-xindra/newview/llfloatertools.cpp6
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