summaryrefslogtreecommitdiff
path: root/indra
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-08-31 21:36:45 -0700
committerMerov Linden <merov@lindenlab.com>2010-08-31 21:36:45 -0700
commit786df38c2a034b976c23479326ec3790d3e025c4 (patch)
treed24f632e8a007d8b8dd24254a2001cb4101a911c /indra
parent6d8208bac94ca4ebdd8e4e1030cdb8e38ef3da9f (diff)
SNOW-681 VWR-1852 : Local ruler mode aligned incorrectly for linked objects
Diffstat (limited to 'indra')
-rw-r--r--indra/newview/llselectmgr.cpp4
1 files changed, 4 insertions, 0 deletions
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();