* Fixes a small bug where load-oar fails due to whitespace in region name.
From: Arthur Rodrigo S Valadares <arthursv@linux.vnet.ibm.com>0.6.2-post-fixes
parent
694e37f529
commit
9d2e0535f1
|
@ -208,7 +208,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");
|
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
|
||||||
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
|
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -245,7 +245,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
|
||||||
{
|
{
|
||||||
foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
|
foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders)
|
||||||
{
|
{
|
||||||
if (filename.EndsWith(loader.Key))
|
if (@filename.EndsWith(loader.Key))
|
||||||
{
|
{
|
||||||
lock (m_scene)
|
lock (m_scene)
|
||||||
{
|
{
|
||||||
|
@ -268,7 +268,7 @@ namespace OpenSim.Region.Environment.Modules.World.Terrain
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader availible for that format.");
|
m_log.Error("[TERRAIN]: Unable to load heightmap, no file loader available for that format.");
|
||||||
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
|
throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue