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/ScriptEngine/Shared/Instance/ScriptInstance.cs
This commit is contained in:
Melanie
2012-12-16 21:19:30 +00:00
parent f30d519bcc 1a262bdde7
commit 0a876a305c
43 changed files with 1161 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2895,11 +2895,14 @@ namespace OpenSim.Region.Framework.Scenes
public void PhysicsOutOfBounds(Vector3 pos)
{
m_log.Error("[PHYSICS]: Physical Object went out of bounds.");
// Note: This is only being called on the root prim at this time.
m_log.ErrorFormat(
"[SCENE OBJECT PART]: Physical object {0}, localID {1} went out of bounds at {2} in {3}. Stopping at {4} and making non-physical.",
Name, LocalId, pos, ParentGroup.Scene.Name, AbsolutePosition);
RemFlag(PrimFlags.Physics);
DoPhysicsPropertyUpdate(false, true);
//ParentGroup.Scene.PhysicsScene.AddPhysicsActorTaint(PhysActor);
}
public void PhysicsRequestingTerseUpdate()
@@ -4549,7 +4552,7 @@ namespace OpenSim.Region.Framework.Scenes
if (ParentGroup.RootPart == this)
AngularVelocity = new Vector3(0, 0, 0);
}
else
else if (SetVD != wasVD)
{
if (ParentGroup.Scene.CollidablePrims)
{