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

* Spring cleaning on Region.Environment.

Browse Source 
* Converted a large number of read-only fields to be actually, readonly.
* Reformatted code sections.
* Removed redundant code.
This commit is contained in:
Adam Frisby
2008-05-01 16:35:00 +00:00
parent 01f31fd933
commit 13526097f2
76 changed files with 4181 additions and 4314 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
OpenSim/Region/Environment/Scenes/SceneManager.cs
View File

@@ -41,10 +41,13 @@ namespace OpenSim.Region.Environment.Scenes
{
private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
public event RestartSim OnRestartSim;
private readonly List<Scene> m_localScenes;
private Scene m_currentScene = null;
private Scene m_currentScene;
public SceneManager()
{
m_localScenes = new List<Scene>();
}
public List<Scene> Scenes
{
@@ -71,10 +74,7 @@ namespace OpenSim.Region.Environment.Scenes
}
}
public SceneManager()
{
m_localScenes = new List<Scene>();
}
public event RestartSim OnRestartSim;
public void Close()
{
@@ -180,7 +180,7 @@ namespace OpenSim.Region.Environment.Scenes
[Obsolete("TODO: Remove this warning by 0.7")]
public bool RunTerrainCmdOnCurrentScene(string[] cmdparams, ref string result)
{
m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands.");
m_log.Warn("DEPRECIATED: The terrain engine has been replaced with a new terrain plugin module. Please type 'plugin terrain help' for new commands.");
return false;
}
@@ -252,8 +252,8 @@ namespace OpenSim.Region.Environment.Scenes
public bool TrySetCurrentScene(LLUUID regionID)
{
Console.WriteLine("Searching for Region: '{0}'", regionID.ToString());
Console.WriteLine("Searching for Region: '{0}'", regionID);
foreach (Scene scene in m_localScenes)
{
if (scene.RegionInfo.RegionID == regionID)
@@ -262,7 +262,7 @@ namespace OpenSim.Region.Environment.Scenes
return true;
}
}
return false;
}
@@ -313,7 +313,7 @@ namespace OpenSim.Region.Environment.Scenes
{
foreach (Scene mscene in m_localScenes)
{
if((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
if ((mscene.RegionInfo.InternalEndPoint.Equals(ipEndPoint.Address)) &&
(mscene.RegionInfo.InternalEndPoint.Port == ipEndPoint.Port))
{
scene = mscene;
@@ -327,22 +327,22 @@ namespace OpenSim.Region.Environment.Scenes
public void SetDebugPacketOnCurrentScene(int newDebug)
{
ForEachCurrentScene(delegate(Scene scene)
{
List<ScenePresence> scenePresences = scene.GetScenePresences();
foreach (ScenePresence scenePresence in scenePresences)
{
if (!scenePresence.IsChildAgent)
{
m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
scenePresence.Firstname,
scenePresence.Lastname,
newDebug);
List<ScenePresence> scenePresences = scene.GetScenePresences();
scenePresence.ControllingClient.SetDebug(newDebug);
foreach (ScenePresence scenePresence in scenePresences)
{
if (!scenePresence.IsChildAgent)
{
m_log.ErrorFormat("Packet debug for {0} {1} set to {2}",
scenePresence.Firstname,
scenePresence.Lastname,
newDebug);
scenePresence.ControllingClient.SetDebug(newDebug);
}
}
}
});
});
}
public List<ScenePresence> GetCurrentSceneAvatars()
@@ -350,17 +350,17 @@ namespace OpenSim.Region.Environment.Scenes
List<ScenePresence> avatars = new List<ScenePresence>();
ForEachCurrentScene(delegate(Scene scene)
{
List<ScenePresence> scenePresences = scene.GetScenePresences();
{
List<ScenePresence> scenePresences = scene.GetScenePresences();
foreach (ScenePresence scenePresence in scenePresences)
{
if (!scenePresence.IsChildAgent)
{
avatars.Add(scenePresence);
}
}
});
foreach (ScenePresence scenePresence in scenePresences)
{
if (!scenePresence.IsChildAgent)
{
avatars.Add(scenePresence);
}
}
});
return avatars;
}
@@ -381,11 +381,11 @@ namespace OpenSim.Region.Environment.Scenes
public void SetCurrentSceneTimePhase(int timePhase)
{
ForEachCurrentScene(delegate(Scene scene)
{
scene.SetTimePhase(
timePhase)
;
});
{
scene.SetTimePhase(
timePhase)
;
});
}
public void ForceCurrentSceneClientUpdate()
@@ -453,4 +453,4 @@ namespace OpenSim.Region.Environment.Scenes
m_localScenes.ForEach(action);
}
}
}
}