2 files changed, 11 insertions, 0 deletions

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a554e0a..9b4fe7d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-12-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+        * linden/indra/newview/llselectmgr.cpp:
+        VWR-1582: Local ruler mode wrong for linked objects.
+        Also VWR-11103 (regression of above).
+
+
 2008-12-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
         * linden/install.xml:
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++)
                 {