diff options
| author | Dave Parks <davep@lindenlab.com> | 2011-07-18 23:50:50 -0500 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2011-07-18 23:50:50 -0500 |
| commit | 7ef1550fbb01acfb0cba0e849f1933462612784a (patch) | |
| tree | dde820baa0134031d46b0c117ad34545d9e8cfe9 /indra/newview/llviewermenu.cpp | |
| parent | 4dc0850da7469906e5ad052da71830b05005295b (diff) | |
| parent | e8b71e0585ab126f9e77da93d6830a1a73a7aa92 (diff) | |
merge
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
| -rw-r--r-- | indra/newview/llviewermenu.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index a37f8ad0d8..f38dd12f68 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -61,6 +61,7 @@ #include "llfloatersnapshot.h" #include "llfloatertools.h" #include "llfloaterworldmap.h" +#include "llfloaterbuildoptions.h" #include "llavataractions.h" #include "lllandmarkactions.h" #include "llgroupmgr.h" @@ -7161,9 +7162,11 @@ class LLToolsUseSelectionForGrid : public view_listener_t } func; LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func); LLSelectMgr::getInstance()->setGridMode(GRID_MODE_REF_OBJECT); - if (gFloaterTools) + + LLFloaterBuildOptions* build_options_floater = LLFloaterReg::getTypedInstance<LLFloaterBuildOptions>("build_options"); + if (build_options_floater && build_options_floater->getVisible()) { - gFloaterTools->mComboGridMode->setCurrentByIndex((S32)GRID_MODE_REF_OBJECT); + build_options_floater->setGridMode(GRID_MODE_REF_OBJECT); } return true; } |