From af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 16 Dec 2008 00:15:54 -0600
Subject: VWR-1582: Local ruler mode wrong for linked objects.

Also VWR-11103 (regression of above).
---
 linden/indra/newview/llselectmgr.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'linden')

diff --git a/linden/indra/newview/llselectmgr.cpp b/linden/indra/newview/llselectmgr.cpp
index 90b1bd3..7547dd2 100644
--- a/linden/indra/newview/llselectmgr.cpp
+++ b/linden/indra/newview/llselectmgr.cpp
@@ -5499,6 +5499,10 @@ void LLSelectMgr::updateSelectionCenter()
 
 		std::vector < LLViewerObject *> jointed_objects;
 
+		// 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() );
+
 		for (LLObjectSelection::iterator iter = mSelectedObjects->begin();
 			 iter != mSelectedObjects->end(); iter++)
 		{
-- 
cgit v1.1