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/Modules/Terrain | |
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 'OpenSim/Region/Environment/Modules/Terrain')
-rw-r--r-- | OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs index 987c3d0..f758c91 100644 --- a/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs +++ b/OpenSim/Region/Environment/Modules/Terrain/TerrainModule.cs | |||
@@ -178,20 +178,24 @@ namespace OpenSim.Region.Environment.Modules.Terrain | |||
178 | { | 178 | { |
179 | m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value + | 179 | m_log.Error("[TERRAIN]: Unable to load heightmap, the " + loader.Value + |
180 | " parser does not support file loading. (May be save only)"); | 180 | " parser does not support file loading. (May be save only)"); |
181 | return; | 181 | throw new Exception(String.Format("unable to load heightmap: parser {0} does not support loading", loader.Value)); |
182 | } | 182 | } |
183 | catch (FileNotFoundException) | 183 | catch (FileNotFoundException) |
184 | { | 184 | { |
185 | m_log.Error( | 185 | m_log.Error( |
186 | "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)"); | 186 | "[TERRAIN]: Unable to load heightmap, file not found. (A directory permissions error may also cause this)"); |
187 | return; | 187 | throw new Exception(String.Format("unable to load heightmap: file {0} not found (or permissions do not allow access", |
188 | filename)); | ||
188 | } | 189 | } |
189 | } | 190 | } |
191 | CheckForTerrainUpdates(); | ||
190 | m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully"); | 192 | m_log.Info("[TERRAIN]: File (" + filename + ") loaded successfully"); |
191 | return; | 193 | return; |
192 | } | 194 | } |
193 | } | 195 | } |
194 | m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format."); | 196 | m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format."); |
197 | throw new Exception(String.Format("unable to load heightmap from file {0}: no loader available for that format", | ||
198 | filename)); | ||
195 | } | 199 | } |
196 | 200 | ||
197 | /// <summary> | 201 | /// <summary> |
@@ -214,6 +218,7 @@ namespace OpenSim.Region.Environment.Modules.Terrain | |||
214 | catch (NotImplementedException) | 218 | catch (NotImplementedException) |
215 | { | 219 | { |
216 | m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented."); | 220 | m_log.Error("Unable to save to " + filename + ", saving of this file format has not been implemented."); |
221 | throw new Exception(String.Format("unable to save heightmap: {0}: saving of this file format not implemented")); | ||
217 | } | 222 | } |
218 | } | 223 | } |
219 | 224 | ||