summaryrefslogtreecommitdiff
path: root/indra/newview/llselectmgr.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-09-02 11:27:52 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-09-02 11:27:52 +0100
commit63f2ddf377fa0fc6a666cdc1001289335d86258b (patch)
treeace7455bb907429aa992a593b4b0dc3704be8914 /indra/newview/llselectmgr.cpp
parentae115d1a89bc425aee478bd31a66827a6f49fd8a (diff)
parent39e6447d98a36eb196f9ed6a3b06f0390f1ed084 (diff)
merge for VWR-1852 VWR-8726 VWR-4232 VWR-22752
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();