ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-08 02:05:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Restaring the sim works fine in grid mode now. Sims announce themselves to their neighbors when they start up. Neighbors get this message and tell their agents that there's a new sim up.

Browse Source 
* Certain unrecoverable physics based crashes in ODE are now hooked up to the 'restart the sim' routine.
This commit is contained in:
Teravus Ovares
2007-11-28 06:18:07 +00:00
parent f3895c1e01
commit b7d596a6af
13 changed files with 354 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@@ -11,8 +11,14 @@ using OpenSim.Region.Physics.Manager;
namespace OpenSim.Region.Environment.Scenes
{
public delegate void PhysicsCrash();
public class InnerScene
{
#region Events
public event PhysicsCrash UnRecoverableError;
#endregion
#region Fields
public Dictionary<LLUUID, ScenePresence> ScenePresences;
public Dictionary<LLUUID, SceneObjectGroup> SceneObjects;
@@ -26,17 +32,47 @@ namespace OpenSim.Region.Environment.Scenes
internal object m_syncRoot = new object();
public PhysicsScene PhyScene;
public PhysicsScene _PhyScene;
#endregion
public InnerScene(Scene parent, RegionInfo regInfo, PermissionManager permissionsMngr)
{
m_parentScene = parent;
m_regInfo = regInfo;
PermissionsMngr = permissionsMngr;
QuadTree = new BasicQuadTreeNode(null, "/0/", 0, 0, 256, 256);
QuadTree.Subdivide();
QuadTree.Subdivide();
}
public PhysicsScene PhyScene
{
get
{ return _PhyScene; }
set
{
// If we're not doing the initial set
// Then we've got to remove the previous
// event handler
try
{
_PhyScene.OnPhysicsCrash -= physicsBasedCrash;
}
catch (System.NullReferenceException)
{
// This occurs when storing to _PhyScene the first time.
// Is there a better way to check the event handler before
// getting here
// This can be safely ignored. We're setting the first inital
// there are no event handler's registered.
}
_PhyScene = value;
_PhyScene.OnPhysicsCrash += physicsBasedCrash;
}
}
public void Close()
@@ -55,9 +91,9 @@ namespace OpenSim.Region.Environment.Scenes
// PhysX does this (runs in the background).
if (PhyScene.IsThreaded)
if (_PhyScene.IsThreaded)
{
PhyScene.GetResults();
_PhyScene.GetResults();
}
}
@@ -75,7 +111,7 @@ namespace OpenSim.Region.Environment.Scenes
{
lock (m_syncRoot)
{
PhyScene.Simulate((float)elapsed);
_PhyScene.Simulate((float)elapsed);
}
}
@@ -338,6 +374,15 @@ namespace OpenSim.Region.Environment.Scenes
#region Other Methods
public void physicsBasedCrash()
{
if (UnRecoverableError != null)
{
UnRecoverableError();
}
}
public LLUUID ConvertLocalIDToFullID(uint localID)
{
SceneObjectGroup group = GetGroupByPrim(localID);