Merge branch 'master' into careminster
commit
627600dd68
|
@ -941,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes
|
||||||
string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
|
string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
|
||||||
UUID tileID;
|
UUID tileID;
|
||||||
|
|
||||||
if ((tile!=UUID.Zero.ToString()) && UUID.TryParse(tile, out tileID))
|
if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out tileID))
|
||||||
{
|
{
|
||||||
RegionInfo.RegionSettings.TerrainImageID = tileID;
|
RegionInfo.RegionSettings.TerrainImageID = tileID;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue