From 3be87bb04685e971965ab5ac4166165c3785476f Mon Sep 17 00:00:00 2001
From: Andrew Meadows <andrew@lindenlab.com>
Date: Wed, 15 Dec 2010 11:23:00 -0800
Subject: ER-407 child bounding boxes not rotated properly for encroachment
 returnability Using the correct method for joining BBoxes in the agent frame
 ::addBBoxAgent()

---
 indra/newview/llviewerobject.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'indra/newview/llviewerobject.cpp')

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()
-- 
cgit v1.2.3