aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorSean Dague2009-01-05 15:43:30 +0000
committerSean Dague2009-01-05 15:43:30 +0000
commit9d2e0535f1d1ba2f9e9e312e84b7dca83c6fe48a (patch)
tree95af082ae0e9473ae45fe317e9d3236791cefcce /OpenSim
parentUpdate svn properties, minor formatting cleanup. (diff)
downloadopensim-SC-9d2e0535f1d1ba2f9e9e312e84b7dca83c6fe48a.zip
opensim-SC-9d2e0535f1d1ba2f9e9e312e84b7dca83c6fe48a.tar.gz
opensim-SC-9d2e0535f1d1ba2f9e9e312e84b7dca83c6fe48a.tar.bz2
opensim-SC-9d2e0535f1d1ba2f9e9e312e84b7dca83c6fe48a.tar.xz
* Fixes a small bug where load-oar fails due to whitespace in region name.
From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
index f0af552..76d06cb 100644
--- a/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Terrain/TerrainModule.cs
@@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
208 return; 208 return;
209 } 209 }
210 } 210 }
211 m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format."); 211 m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
212 throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); 212 throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
213 } 213 }
214 214
@@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
245 { 245 {
246 foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) 246 foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
247 { 247 {
248 if (filename.EndsWith(loader.Key)) 248 if (@filename.EndsWith(loader.Key))
249 { 249 {
250 lock (m_scene) 250 lock (m_scene)
251 { 251 {
@@ -268,7 +268,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
268 return; 268 return;
269 } 269 }
270 } 270 }
271 m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format."); 271 m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
272 throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); 272 throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
273 } 273 }
274 274