diff --git a/doc/contributions.txt b/doc/contributions.txt
index 1f374f204a3dab1dbb981f2a8ac576879add7150..c7ed251ea44770196eca13459a8c80ac3b1b9e7e 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 c9b60bf7f5e213920884db082ffe355ed93393ee..fb60b1ece712631c611a52cc535c7a6afdb9e336 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();