summaryrefslogtreecommitdiff
path: root/indra/newview/llfloatertools.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-02-14 09:05:55 -0500
committerOz Linden <oz@lindenlab.com>2013-02-14 09:05:55 -0500
commitc880c961bb2a0838bc529efc07cfeb12f5636d88 (patch)
treebeff6cda58f68c5d95277cf77957dc96c2a79dfd /indra/newview/llfloatertools.cpp
parent841dc5da2ef9626fa4ab9255681d217df62a6b0b (diff)
parente87000ba0750e55d9d6b55feccc4124f5d2b4b74 (diff)
merge changes for 3.4.5
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()
{