livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAINT-1743 "Use Selection for Grid" does not change the grid ruler to "Reference" 

in the tools floater
Reviewed with Simon.
master
Kelly Washington 2012-10-25 09:54:04 -07:00
parent 9b8cd0e923
commit d41eaa2e3d
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
indra/newview/llfloatertools.cpp
View File

@ -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()
{

2
indra/newview/llfloatertools.h
View File

@ -107,6 +107,8 @@ public:
bool selectedMediaEditable();
void updateLandImpacts();
static void setGridMode(S32 mode);
private:
void refresh();
void refreshMedia();

3
indra/newview/llselectmgr.cpp
View File

@ -211,7 +211,6 @@ LLSelectMgr::LLSelectMgr()
mGridMode = GRID_MODE_WORLD;
gSavedSettings.setS32("GridMode", (S32)GRID_MODE_WORLD);
mGridValid = FALSE;
mSelectedObjects = new LLObjectSelection();
mHoverObjects = new LLObjectSelection();
@ -1170,7 +1169,6 @@ void LLSelectMgr::setGridMode(EGridMode mode)
mGridMode = mode;
gSavedSettings.setS32("GridMode", mode);
updateSelectionCenter();
mGridValid = FALSE;
}
void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &scale)
@ -1271,7 +1269,6 @@ void LLSelectMgr::getGrid(LLVector3& origin, LLQuaternion &rotation, LLVector3 &
origin = mGridOrigin;
rotation = mGridRotation;
scale = mGridScale;
mGridValid = TRUE;
}
//-----------------------------------------------------------------------------

2
indra/newview/llselectmgr.h
View File

@ -769,8 +769,6 @@ private:
LLVector3 mGridOrigin;
LLVector3 mGridScale;
EGridMode mGridMode;
BOOL mGridValid;
BOOL mTEMode; // render te
LLVector3d mSelectionCenterGlobal;

1
indra/newview/llviewermenu.cpp
View File

@ -7477,6 +7477,7 @@ class LLToolsUseSelectionForGrid : public view_listener_t
} func;
LLSelectMgr::getInstance()->getSelection()->applyToRootObjects(&func);
LLSelectMgr::getInstance()->setGridMode(GRID_MODE_REF_OBJECT);
LLFloaterTools::setGridMode((S32)GRID_MODE_REF_OBJECT);
return true;
}
};