summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorAura Linden <aura@lindenlab.com>2014-07-22 18:23:48 -0700
committerAura Linden <aura@lindenlab.com>2014-07-22 18:23:48 -0700
commitf61671aec7a15160f906650b4c7449be68c7b074 (patch)
tree1c8f08f04d137f41c5b8cbf9a579161ff0dd3538 /indra/newview/llfloatertools.cpp
parent3d4acb535d75c4cc78c93dee318bcffaca691237 (diff)
parent532433674c9553636af9ea8d433b9da6d6fae587 (diff)
Merged in release.
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