merge

2 files changed, 26 insertions, 0 deletions

diff --git a/indra/llprimitive/llmodel.cpp b/indra/llprimitive/llmodel.cpp
index 9e3d9704ae..1cada567e9 100644
--- a/indra/llprimitive/llmodel.cpp
+++ b/indra/llprimitive/llmodel.cpp
@@ -1724,4 +1724,29 @@ LLModel::weight_list& LLModel::getJointInfluences(const LLVector3& pos)
 	}					
 }
 
+void LLModel::setPhysicsShape(const LLModel::physics_shape& shape)
+{
+	mPhysicsShape = shape;
+
+	mHullCenter.resize(mPhysicsShape.size());
+	mPhysicsPoints = 0;
+	mPhysicsCenter.clear();
+
+	for (U32 i = 0; i < shape.size(); ++i)
+	{
+		LLVector3 cur_center;
+
+		for (U32 j = 0; j < shape[i].size(); ++j)
+		{
+			cur_center += shape[i][j];
+		}
+		mPhysicsCenter += cur_center;
+		cur_center *= 1.f/shape[i].size();
+		mHullCenter[i] = cur_center;
+		mPhysicsPoints += shape[i].size();
+	}
+
+	mPhysicsCenter *= 1.f/mPhysicsPoints;
+}
+
 
diff --git a/indra/llprimitive/llmodel.h b/indra/llprimitive/llmodel.h
index e6696b984f..ec21ef2fcd 100644
--- a/indra/llprimitive/llmodel.h
+++ b/indra/llprimitive/llmodel.h
@@ -160,6 +160,7 @@ public:
 
 	//physics shape
 	physics_shape mPhysicsShape;
+	void setPhysicsShape(const physics_shape& shape);
 
 	LLVector3 mPhysicsCenter;
 	std::vector<LLVector3> mHullCenter;