diff options
author | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2012-05-08 15:51:56 -0400 |
commit | 95090c5d1e857130f7266b5753d3650d02e9386c (patch) | |
tree | cff60656371883829dd7451ed4a1d3d09258b5ae /indra/newview/llviewermenu.cpp | |
parent | 5bf742895d882f1d7178c2b18a347bf485877a02 (diff) | |
parent | d6569db3520f7e0ce2d93febb6f4e26b48c08a3d (diff) |
merge changes for version 3.3.1
Diffstat (limited to 'indra/newview/llviewermenu.cpp')
-rw-r--r-- | indra/newview/llviewermenu.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index e4cc26885d..6ed2d78edf 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -7354,12 +7354,6 @@ class LLToolsUseSelectionForGrid : public view_listener_t } func; LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func); LLSelectMgr::getInstance()->setGridMode(GRID_MODE_REF_OBJECT); - - LLFloaterBuildOptions* build_options_floater = LLFloaterReg::getTypedInstance<LLFloaterBuildOptions>("build_options"); - if (build_options_floater && build_options_floater->getVisible()) - { - build_options_floater->setGridMode(GRID_MODE_REF_OBJECT); - } return true; } }; |