diff options
author | Robert Adams | 2013-10-16 07:52:30 -0700 |
---|---|---|
committer | Robert Adams | 2013-10-16 07:52:30 -0700 |
commit | 97bc5263de990ce80fc0adfbdb632ba8c5cbb77b (patch) | |
tree | 6d6d27ea6f8b8d93a8622f6fd9b257387ac7ca94 /OpenSim/Region/CoreModules/World/Terrain | |
parent | Merge branch 'master' into varregion (diff) | |
download | opensim-SC_OLD-97bc5263de990ce80fc0adfbdb632ba8c5cbb77b.zip opensim-SC_OLD-97bc5263de990ce80fc0adfbdb632ba8c5cbb77b.tar.gz opensim-SC_OLD-97bc5263de990ce80fc0adfbdb632ba8c5cbb77b.tar.bz2 opensim-SC_OLD-97bc5263de990ce80fc0adfbdb632ba8c5cbb77b.tar.xz |
varregion: move the compressed heighmap compression factor from
Constants into TerrainData.
Save compression factor with the terrain blob in the database.
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Terrain')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs index eb6187b..459af73 100644 --- a/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs +++ b/OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs | |||
@@ -74,6 +74,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
74 | #endregion | 74 | #endregion |
75 | 75 | ||
76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 76 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
77 | private static readonly string LogHeader = "[TERRAIN MODULE]"; | ||
77 | 78 | ||
78 | private readonly Commander m_commander = new Commander("terrain"); | 79 | private readonly Commander m_commander = new Commander("terrain"); |
79 | 80 | ||
@@ -712,7 +713,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
712 | private void CheckForTerrainUpdates(bool respectEstateSettings) | 713 | private void CheckForTerrainUpdates(bool respectEstateSettings) |
713 | { | 714 | { |
714 | bool shouldTaint = false; | 715 | bool shouldTaint = false; |
715 | float[] terrData = m_channel.GetFloatsSerialised(); | 716 | float[] terrHeights = m_channel.GetFloatsSerialised(); |
716 | int x; | 717 | int x; |
717 | for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize) | 718 | for (x = 0; x < m_channel.Width; x += Constants.TerrainPatchSize) |
718 | { | 719 | { |
@@ -727,10 +728,11 @@ namespace OpenSim.Region.CoreModules.World.Terrain | |||
727 | if (respectEstateSettings && LimitChannelChanges(x, y)) | 728 | if (respectEstateSettings && LimitChannelChanges(x, y)) |
728 | { | 729 | { |
729 | // Terrain heights were modified. Refetch the terrain info. | 730 | // Terrain heights were modified. Refetch the terrain info. |
730 | terrData = m_channel.GetFloatsSerialised(); | 731 | terrHeights = m_channel.GetFloatsSerialised(); |
731 | } | 732 | } |
732 | 733 | ||
733 | SendToClients(terrData, x, y); | 734 | // m_log.DebugFormat("{0} Patch modified. Sending (x,y) = ({1},{2})", LogHeader, x, y); |
735 | SendToClients(terrHeights, x, y); | ||
734 | shouldTaint = true; | 736 | shouldTaint = true; |
735 | } | 737 | } |
736 | } | 738 | } |