diff options
| author | Andrew Meadows <andrew@lindenlab.com> | 2010-12-15 11:23:00 -0800 |
|---|---|---|
| committer | Andrew Meadows <andrew@lindenlab.com> | 2010-12-15 11:23:00 -0800 |
| commit | 3be87bb04685e971965ab5ac4166165c3785476f (patch) | |
| tree | 29dbff080b70a959b587b179d12df29c2b67e2fb /indra/newview | |
| parent | 5663f9dd55b42c06c24456a9587ff64603670303 (diff) | |
ER-407 child bounding boxes not rotated properly for encroachment returnability
Using the correct method for joining BBoxes in the agent frame ::addBBoxAgent()
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llviewerobject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 15207e7346..ae2154d63b 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -524,7 +524,7 @@ bool LLViewerObject::isReturnable() { LLViewerObject* child = *iter; LLBBox child_box(child->getPositionRegion(), child->getRotationRegion(), child->getScale() * -0.5f, child->getScale() * 0.5f); - bounding_box.join(child_box); + bounding_box.addBBoxAgent(child_box); } return !isAttachment() |