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

Fix problem where restarting the currently selected region would stop various console commands (e.g. "show users") from working.

Browse Source 
This was because the "currently selected" scene reference was being left as the dead scene instead of the restarted Scene object.
This commit is contained in:
Justin Clark-Casey (justincc)
2012-11-23 02:22:30 +00:00
parent 049987925d
commit 8c8c8a00a4
4 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@@ -1134,16 +1134,10 @@ namespace OpenSim.Region.Framework.Scenes
}
}
m_log.Error("[REGION]: Closing");
m_log.InfoFormat("[REGION]: Restarting region {0}", Name);
Close();
if (PhysicsScene != null)
{
PhysicsScene.Dispose();
}
m_log.Error("[REGION]: Firing Region Restart Message");
base.Restart();
}

46
OpenSim/Region/Framework/Scenes/SceneManager.cs
View File

@@ -100,23 +100,25 @@ namespace OpenSim.Region.Framework.Scenes
}
private readonly List<Scene> m_localScenes = new List<Scene>();
private Scene m_currentScene = null;
public List<Scene> Scenes
{
get { return new List<Scene>(m_localScenes); }
}
public Scene CurrentScene
{
get { return m_currentScene; }
}
/// <summary>
/// Scene selected from the console.
/// </summary>
/// <value>
/// If null, then all scenes are considered selected (signalled as "Root" on the console).
/// </value>
public Scene CurrentScene { get; private set; }
public Scene CurrentOrFirstScene
{
get
{
if (m_currentScene == null)
if (CurrentScene == null)
{
lock (m_localScenes)
{
@@ -128,7 +130,7 @@ namespace OpenSim.Region.Framework.Scenes
}
else
{
return m_currentScene;
return CurrentScene;
}
}
}
@@ -178,8 +180,7 @@ namespace OpenSim.Region.Framework.Scenes
public void HandleRestart(RegionInfo rdata)
{
m_log.Error("[SCENEMANAGER]: Got Restart message for region:" + rdata.RegionName + " Sending up to main");
int RegionSceneElement = -1;
Scene restartedScene = null;
lock (m_localScenes)
{
@@ -187,19 +188,18 @@ namespace OpenSim.Region.Framework.Scenes
{
if (rdata.RegionName == m_localScenes[i].RegionInfo.RegionName)
{
RegionSceneElement = i;
restartedScene = m_localScenes[i];
m_localScenes.RemoveAt(i);
break;
}
}
// Now we make sure the region is no longer known about by the SceneManager
// Prevents duplicates.
if (RegionSceneElement >= 0)
{
m_localScenes.RemoveAt(RegionSceneElement);
}
}
// If the currently selected scene has been restarted, then we can't reselect here since we the scene
// hasn't yet been recreated. We will have to leave this to the caller.
if (CurrentScene == restartedScene)
CurrentScene = null;
// Send signal to main that we're restarting this sim.
OnRestartSim(rdata);
}
@@ -341,14 +341,14 @@ namespace OpenSim.Region.Framework.Scenes
private void ForEachCurrentScene(Action<Scene> func)
{
if (m_currentScene == null)
if (CurrentScene == null)
{
lock (m_localScenes)
m_localScenes.ForEach(func);
}
else
{
func(m_currentScene);
func(CurrentScene);
}
}
@@ -368,7 +368,7 @@ namespace OpenSim.Region.Framework.Scenes
|| (String.Compare(regionName, "..") == 0)
|| (String.Compare(regionName, "/") == 0))
{
m_currentScene = null;
CurrentScene = null;
return true;
}
else
@@ -379,7 +379,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (String.Compare(scene.RegionInfo.RegionName, regionName, true) == 0)
{
m_currentScene = scene;
CurrentScene = scene;
return true;
}
}
@@ -399,7 +399,7 @@ namespace OpenSim.Region.Framework.Scenes
{
if (scene.RegionInfo.RegionID == regionID)
{
m_currentScene = scene;
CurrentScene = scene;
return true;
}
}