diff options
author | Sean Dague | 2008-04-21 12:42:56 +0000 |
---|---|---|
committer | Sean Dague | 2008-04-21 12:42:56 +0000 |
commit | bf1580fba45df7624180b07599c8170074500c99 (patch) | |
tree | 696a69c94554f0789b123c82fb34c658e9a0b6af /OpenSim/Region/Environment/Scenes | |
parent | * Various refactorings. (diff) | |
download | opensim-SC-bf1580fba45df7624180b07599c8170074500c99.zip opensim-SC-bf1580fba45df7624180b07599c8170074500c99.tar.gz opensim-SC-bf1580fba45df7624180b07599c8170074500c99.tar.bz2 opensim-SC-bf1580fba45df7624180b07599c8170074500c99.tar.xz |
From: Dr Scofield <hud@zurich.ibm.com>
the attached patch set is centered around RemoteAdminPlugin and focuses
mainly on making it more robust (i.e. more parameter checking and better
error reporting) but also we've re-implemented the LoadTerrain stuff that
got disabled during the terrain code reworking:
* missing PostInitialize() calls on region modules that were loaded
for regions created via RemoteAdmin's CreateRegion XmlRpc call
* re-implements RemoteAdmin's LoadTerrain XmlRpc call (probably lost
during the TerrainModule rework)
* adds lots more parameter checking and error reporting to RemoteAdmin
* adds a read-only property to RegionApplicationBase so that we can
access the CommsManager
* adds Exceptions to TerrainModule so that we get better error case
feedback (and can report more meaningful errors in turn)
* adds a CheckForTerrainUpdate() call to
TerrainModule.LoadFromFile() to make terrain changes effective
* adds TryGetCurrentScene(LLUUID) to SceneManager so that we can
retrieve Scenes not only by name but also by LLUUID
cheers,
dr scofield
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneManager.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneManager.cs b/OpenSim/Region/Environment/Scenes/SceneManager.cs index 61a4eae..40e313a 100644 --- a/OpenSim/Region/Environment/Scenes/SceneManager.cs +++ b/OpenSim/Region/Environment/Scenes/SceneManager.cs | |||
@@ -250,6 +250,22 @@ namespace OpenSim.Region.Environment.Scenes | |||
250 | } | 250 | } |
251 | } | 251 | } |
252 | 252 | ||
253 | public bool TrySetCurrentScene(LLUUID regionID) | ||
254 | { | ||
255 | Console.WriteLine("Searching for Region: '{0}'", regionID.ToString()); | ||
256 | |||
257 | foreach (Scene scene in m_localScenes) | ||
258 | { | ||
259 | if (scene.RegionInfo.RegionID == regionID) | ||
260 | { | ||
261 | m_currentScene = scene; | ||
262 | return true; | ||
263 | } | ||
264 | } | ||
265 | |||
266 | return false; | ||
267 | } | ||
268 | |||
253 | public bool TryGetScene(string regionName, out Scene scene) | 269 | public bool TryGetScene(string regionName, out Scene scene) |
254 | { | 270 | { |
255 | foreach (Scene mscene in m_localScenes) | 271 | foreach (Scene mscene in m_localScenes) |