diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index e21681d..65d4c4a 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -218,7 +218,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
218 | if (terrainConfig != null) | 218 | if (terrainConfig != null) |
219 | { | 219 | { |
220 | m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain); | 220 | m_InitialTerrain = terrainConfig.GetString("InitialTerrain", m_InitialTerrain); |
221 | m_sendTerrainUpdatesByViewDistance = | 221 | m_sendTerrainUpdatesByViewDistance = |
222 | terrainConfig.GetBoolean( | 222 | terrainConfig.GetBoolean( |
223 | "SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance); | 223 | "SendTerrainUpdatesByViewDistance",m_sendTerrainUpdatesByViewDistance); |
224 | } | 224 | } |
@@ -240,7 +240,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
240 | if(m_baked != null) | 240 | if(m_baked != null) |
241 | m_channel = m_baked.MakeCopy(); | 241 | m_channel = m_baked.MakeCopy(); |
242 | else | 242 | else |
243 | m_channel = new TerrainChannel(m_InitialTerrain, | 243 | m_channel = new TerrainChannel(m_InitialTerrain, |
244 | (int)m_scene.RegionInfo.RegionSizeX, | 244 | (int)m_scene.RegionInfo.RegionSizeX, |
245 | (int)m_scene.RegionInfo.RegionSizeY, | 245 | (int)m_scene.RegionInfo.RegionSizeY, |
246 | (int)m_scene.RegionInfo.RegionSizeZ); | 246 | (int)m_scene.RegionInfo.RegionSizeZ); |
@@ -463,7 +463,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
463 | throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); | 463 | throw new TerrainException(String.Format("unable to load heightmap from file {0}: no loader available for that format", filename)); |
464 | } | 464 | } |
465 | 465 | ||
466 | public void LoadFromStream(string filename, Vector3 displacement, | 466 | public void LoadFromStream(string filename, Vector3 displacement, |
467 | float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream) | 467 | float rotationDegrees, Vector2 boundingOrigin, Vector2 boundingSize, Stream stream) |
468 | { | 468 | { |
469 | foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) | 469 | foreach (KeyValuePair<string, ITerrainLoader> loader in m_loaders) |
@@ -724,7 +724,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
724 | 724 | ||
725 | /// <summary> | 725 | /// <summary> |
726 | /// Saves the current state of the region into the baked map buffer. | 726 | /// Saves the current state of the region into the baked map buffer. |
727 | 727 | ||
728 | /// </summary> | 728 | /// </summary> |
729 | public void UpdateBakedMap() | 729 | public void UpdateBakedMap() |
730 | { | 730 | { |
@@ -825,7 +825,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
825 | m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave); | 825 | m_scene.RegionInfo.RegionName, filename, m_supportFileExtensionsForTileSave); |
826 | } | 826 | } |
827 | 827 | ||
828 | 828 | ||
829 | /// <summary> | 829 | /// <summary> |
830 | /// This is used to check to see of any of the terrain is tainted and, if so, schedule | 830 | /// This is used to check to see of any of the terrain is tainted and, if so, schedule |
831 | /// updates for all the presences. | 831 | /// updates for all the presences. |
@@ -945,7 +945,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
945 | lock (m_perClientPatchUpdates) | 945 | lock (m_perClientPatchUpdates) |
946 | m_perClientPatchUpdates.Remove(client); | 946 | m_perClientPatchUpdates.Remove(client); |
947 | } | 947 | } |
948 | 948 | ||
949 | /// <summary> | 949 | /// <summary> |
950 | /// Scan over changes in the terrain and limit height changes. This enforces the | 950 | /// Scan over changes in the terrain and limit height changes. This enforces the |
951 | /// non-estate owner limits on rate of terrain editting. | 951 | /// non-estate owner limits on rate of terrain editting. |
@@ -1312,7 +1312,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
1312 | } | 1312 | } |
1313 | } | 1313 | } |
1314 | return ret; | 1314 | return ret; |
1315 | } | 1315 | } |
1316 | 1316 | ||
1317 | private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action, | 1317 | private void client_OnModifyTerrain(UUID user, float height, float seconds, byte size, byte action, |
1318 | float north, float west, float south, float east, UUID agentId) | 1318 | float north, float west, float south, float east, UUID agentId) |