diff options
| author | Melanie | 2013-01-31 20:47:49 +0000 |
|---|---|---|
| committer | Melanie | 2013-01-31 20:47:49 +0000 |
| commit | 627600dd68dc6a6f192e8de541acfe2e0ea4f198 (patch) | |
| tree | 8806bf0110e135176fd1707a52f4250346f5f7da | |
| parent | Merge branch 'avination' into careminster (diff) | |
| parent | Whitespace fix and removing unneccessary parentheses (diff) | |
| download | opensim-SC_OLD-627600dd68dc6a6f192e8de541acfe2e0ea4f198.zip opensim-SC_OLD-627600dd68dc6a6f192e8de541acfe2e0ea4f198.tar.gz opensim-SC_OLD-627600dd68dc6a6f192e8de541acfe2e0ea4f198.tar.bz2 opensim-SC_OLD-627600dd68dc6a6f192e8de541acfe2e0ea4f198.tar.xz | |
Merge branch 'master' into careminster
| -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 40a57a4..6d50c13 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
| @@ -941,7 +941,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
| 941 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); | 941 | string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString()); |
| 942 | UUID tileID; | 942 | UUID tileID; |
| 943 | 943 | ||
| 944 | if ((tile!=UUID.Zero.ToString()) && UUID.TryParse(tile, out tileID)) | 944 | if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out tileID)) |
| 945 | { | 945 | { |
| 946 | RegionInfo.RegionSettings.TerrainImageID = tileID; | 946 | RegionInfo.RegionSettings.TerrainImageID = tileID; |
| 947 | } | 947 | } |