Merge commit '7d033187d8fd49d9a38531061c38783e81d69f5b' into bigmerge

This commit is contained in:
Melanie
2011-10-12 01:41:28 +01:00
3 changed files with 36 additions and 24 deletions

View File

@@ -188,6 +188,11 @@ namespace OpenSim.Region.Framework.Scenes
});
}
/// <summary>
/// Perform a physics frame update.
/// </summary>
/// <param name="elapsed"></param>
/// <returns></returns>
protected internal float UpdatePhysics(double elapsed)
{
lock (m_syncRoot)