summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authordavep <none@none>2014-08-27 13:04:32 -0500
committerdavep <none@none>2014-08-27 13:04:32 -0500
commit749d1665643b33d6c5b7b97e43f4eae996fbf465 (patch)
treeeea7beb291f9fbffd5284da4f55701dcf5286720 /indra/newview/llfloatertools.cpp
parentd0428575fb9c3d285dc32e61808a877cb24efa89 (diff)
parentb021c90e7bccdd0f9a916946e7716a00034254c2 (diff)
Automated merge with https://bitbucket.org/davep/viewer-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