Merge branch 'master' into careminster

avinationmerge
Melanie 2013-01-31 20:47:49 +00:00
commit 627600dd68
1 changed files with 1 additions and 1 deletions

View File

@ -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;
} }