diff options
| author | Paul ProductEngine <pguslisty@productengine.com> | 2011-06-21 21:00:06 +0300 |
|---|---|---|
| committer | Paul ProductEngine <pguslisty@productengine.com> | 2011-06-21 21:00:06 +0300 |
| commit | 9afc77ba0affee16d9dbee312417aaef541eabba (patch) | |
| tree | 27794d1dff6ec88635ea7e3be442840235fba2ca /indra/newview/llviewermenu.cpp | |
| parent | 226bf6db06ee3d3703a39a5cd5a7ed5776796e55 (diff) | |
SH-1719 FIXED Viewer side cleanup of presentation of accounting data in build tools
- Moved grid mode combo box to the grid options floater
- Updated UI of the build floater according to the spec
- Fixed "conflict" between LLFloaterOpenHandler and LLFloaterHandler command handlers
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 41d8b57f36..4bf5454905 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -60,6 +60,7 @@ #include "llfloatersnapshot.h" #include "llfloatertools.h" #include "llfloaterworldmap.h" +#include "llfloaterbuildoptions.h" #include "llavataractions.h" #include "lllandmarkactions.h" #include "llgroupmgr.h" @@ -7159,9 +7160,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; } |