diff options
| author | Mic Bowman | 2013-01-31 14:54:19 -0800 |
|---|---|---|
| committer | Mic Bowman | 2013-01-31 14:54:19 -0800 |
| commit | f984922dfdd3ed3134052bd36c7dfc09be59be3a (patch) | |
| tree | 8db60e4c06b9c6e284ee5c6694c61eec78b9d522 /OpenSim/Region/Framework | |
| parent | Move the JsonStore regular expressions to static variables to avoid (diff) | |
| parent | Whitespace fix and removing unneccessary parentheses (diff) | |
| download | opensim-SC_OLD-f984922dfdd3ed3134052bd36c7dfc09be59be3a.zip opensim-SC_OLD-f984922dfdd3ed3134052bd36c7dfc09be59be3a.tar.gz opensim-SC_OLD-f984922dfdd3ed3134052bd36c7dfc09be59be3a.tar.bz2 opensim-SC_OLD-f984922dfdd3ed3134052bd36c7dfc09be59be3a.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework')
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index 9e3d60f..f8d84e3 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -917,7 +917,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 917 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); | 917 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); |
| 918 | UUID tileID; | 918 | UUID tileID; |
| 919 | 919 | ||
| 920 | if ((tile!=UUID.Zero.ToString()) && UUID.TryParse(tile, out tileID)) | 920 | if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out tileID)) |
| 921 | { | 921 | { |
| 922 | RegionInfo.RegionSettings.TerrainImageID = tileID; | 922 | RegionInfo.RegionSettings.TerrainImageID = tileID; |
| 923 | } | 923 | } |