summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2012-11-08 14:23:34 -0600
committerDave Parks <davep@lindenlab.com>2012-11-08 14:23:34 -0600
commitccad8c9411977287f1c42b288bf796308de81094 (patch)
treed114771df8469e4c9df6a9ecdd22edcbba7f24a0 /indra/newview/llfloatertools.cpp
parentc431ddf629b7f1149c44b2063d216dd34bcd2b12 (diff)
parent2126cdb9a25da4dcc4c81659038b85bcff17c4ee (diff)
Automated merge with http://bitbucket.org/lindenlab/viewer-lion
Diffstat (limited to 'indra/newview/llfloatertools.cpp')
-rw-r--r--indra/newview/llfloatertools.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 48484786f6..1eb7f4469a 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1055,6 +1055,17 @@ void commit_grid_mode(LLUICtrl *ctrl)
LLSelectMgr::getInstance()->setGridMode((EGridMode)combo->getCurrentIndex());
}
+// static
+void LLFloaterTools::setGridMode(S32 mode)
+{
+ LLFloaterTools* tools_floater = LLFloaterReg::getTypedInstance<LLFloaterTools>("build");
+ if (!tools_floater || !tools_floater->mComboGridMode)
+ {
+ return;
+ }
+
+ tools_floater->mComboGridMode->setCurrentByIndex(mode);
+}
void LLFloaterTools::onClickGridOptions()
{