ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into careminster

Browse Source 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
This commit is contained in:
Melanie
2013-01-23 02:38:59 +00:00
parent 12efac494a 80b1e32bfa
commit cc4cfd9fa8
50 changed files with 1335 additions and 12560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
View File

@@ -2470,18 +2470,6 @@ namespace OpenSim.Region.Framework.Scenes
return new Vector3(0, 0, 0);
return ParentGroup.GetGeometricCenter();
/*
PhysicsActor pa = PhysActor;
if (pa != null)
{
Vector3 vtmp = pa.CenterOfMass;
return vtmp;
}
else
return new Vector3(0, 0, 0);
*/
}
public float GetMass()