From 786df38c2a034b976c23479326ec3790d3e025c4 Mon Sep 17 00:00:00 2001 From: Merov Linden Date: Tue, 31 Aug 2010 21:36:45 -0700 Subject: SNOW-681 VWR-1852 : Local ruler mode aligned incorrectly for linked objects --- doc/contributions.txt | 2 ++ indra/newview/llselectmgr.cpp | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/doc/contributions.txt b/doc/contributions.txt index 1f374f204a..c7ed251ea4 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -311,6 +311,7 @@ Iskar Ariantho VWR-1223 VWR-11759 Jacek Antonelli + SNOW-388 VWR-165 VWR-188 VWR-427 @@ -634,6 +635,7 @@ Techwolf Lupindo SNOW-92 SNOW-649 SNOW-680 + SNOW-681 VWR-12385 tenebrous pau VWR-247 diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index c9b60bf7f5..fb60b1ece7 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -5629,6 +5629,10 @@ void LLSelectMgr::updateSelectionCenter() LLVector3d select_center; // keep a list of jointed objects for showing the joint HUDEffects + // Initialize the bounding box to the root prim, so the BBox orientation + // matches the root prim's (affecting the orientation of the manipulators). + bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() ); + std::vector < LLViewerObject *> jointed_objects; for (LLObjectSelection::iterator iter = mSelectedObjects->begin(); -- cgit v1.2.3