Merge branch 'master' into careminster-presence-refactor

This commit is contained in:
Melanie
2010-06-19 20:32:01 +01:00
7 changed files with 55 additions and 30 deletions

View File

@@ -1498,6 +1498,10 @@ namespace OpenSim.Region.Framework.Scenes
DoPhysicsPropertyUpdate(RigidBody, true);
PhysActor.SetVolumeDetect(VolumeDetectActive ? 1 : 0);
}
else
{
m_log.DebugFormat("[SPEW]: physics actor is null for {0} with parent {1}", UUID, this.ParentGroup.UUID);
}
}
}
}