diff options
Diffstat (limited to 'indra/newview/llmanip.cpp')
| -rw-r--r-- | indra/newview/llmanip.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/llmanip.cpp b/indra/newview/llmanip.cpp index 14f86d12e3..953befcd30 100644 --- a/indra/newview/llmanip.cpp +++ b/indra/newview/llmanip.cpp @@ -94,9 +94,10 @@ void LLManip::rebuild(LLViewerObject* vobj) LLManip::LLManip( const LLString& name, LLToolComposite* composite ) : LLTool( name, composite ), - mInSnapRegime(FALSE) -{} - + mInSnapRegime(FALSE), + mHighlightedPart(LL_NO_PART) +{ +} void LLManip::getManipNormal(LLViewerObject* object, EManipPart manip, LLVector3 &normal) { @@ -360,14 +361,11 @@ void LLManip::renderGuidelines(BOOL draw_x, BOOL draw_y, BOOL draw_z) LLVector3 grid_scale; gSelectMgr->getGrid(grid_origin, grid_rot, grid_scale); - LLViewerObject* object = mObjectSelection->getFirstRootObject(); + const BOOL children_ok = TRUE; + LLViewerObject* object = mObjectSelection->getFirstRootObject(children_ok); if (!object) { - object = mObjectSelection->getFirstObject(); - if (!object) - { - return; - } + return; } //LLVector3 center_agent = gSelectMgr->getBBoxOfSelection().getCenterAgent(); |