diff options
| author | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2011-08-04 09:12:08 -0400 |
| commit | ca3cea390ca44e6e6c390b390e0ebdfafd2afa9e (patch) | |
| tree | 005b934f87b6c5adc0a6f84ef6f12c67d606ce37 /indra/newview/llviewermenu.cpp | |
| parent | 1d9fe077a64d36272b32ae0fb1888d2b25aa1d43 (diff) | |
| parent | 5451af6cca43f296e1b5654ab3e611928929c1c9 (diff) | |
merge changes for storm-1537 : releasable mesh branch
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 f74bcafc5c..f6499e12de 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -62,6 +62,7 @@ #include "llfloatersnapshot.h" #include "llfloatertools.h" #include "llfloaterworldmap.h" +#include "llfloaterbuildoptions.h" #include "llavataractions.h" #include "lllandmarkactions.h" #include "llgroupmgr.h" @@ -7163,9 +7164,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; } |