summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorMerov Linden <merov@lindenlab.com>2010-09-09 10:40:25 -0700
committerMerov Linden <merov@lindenlab.com>2010-09-09 10:40:25 -0700
commit81ea8d1751a8866b9ec998542c7d6e9b5645f357 (patch)
tree1f7f45a9bcf469efe9fc30c68aee2638342c1557 /indra/newview/llselectmgr.cpp
parentf2d61c7371171e0ee1329186116c585aa5de7f52 (diff)
parent72e597a6f9e6dacbb41383ee8ee29e55acff4b74 (diff)
Pull from lindenlab/viewer-development
Diffstat (limited to 'indra/newview/llselectmgr.cpp')
-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();