diff options
| author | Jacek Antonelli | 2008-12-16 00:15:54 -0600 |
|---|---|---|
| committer | Jacek Antonelli | 2008-12-16 00:15:54 -0600 |
| commit | af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc (patch) | |
| tree | 21125564d8f6ad75b2c4906d0a7ae69bb2bf4b23 /linden | |
| parent | Switched OpenJPEG package to a tar.bz2. (diff) | |
| download | meta-impy-af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc.zip meta-impy-af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc.tar.gz meta-impy-af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc.tar.bz2 meta-impy-af3fbc6cd6412c9ec5fdfa7d6ed8ab38cd885abc.tar.xz | |
VWR-1582: Local ruler mode wrong for linked objects.
Also VWR-11103 (regression of above).
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llselectmgr.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
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() | |||
| 5499 | 5499 | ||
| 5500 | std::vector < LLViewerObject *> jointed_objects; | 5500 | std::vector < LLViewerObject *> jointed_objects; |
| 5501 | 5501 | ||
| 5502 | // Initialize the bounding box to the root prim, so the BBox orientation | ||
| 5503 | // matches the root prim's (affecting the orientation of the manipulators). | ||
| 5504 | bbox.addBBoxAgent( (mSelectedObjects->getFirstRootObject(TRUE))->getBoundingBoxAgent() ); | ||
| 5505 | |||
| 5502 | for (LLObjectSelection::iterator iter = mSelectedObjects->begin(); | 5506 | for (LLObjectSelection::iterator iter = mSelectedObjects->begin(); |
| 5503 | iter != mSelectedObjects->end(); iter++) | 5507 | iter != mSelectedObjects->end(); iter++) |
| 5504 | { | 5508 | { |