ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into httptests

Browse Source
This commit is contained in:
UbitUmarov
2016-09-18 20:02:59 +01:00
parent e5383604cb 092d4fb9ff
commit 82997c5907
15 changed files with 403 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
OpenSim/Region/CoreModules/World/Terrain/TerrainModule.cs
View File

@@ -231,20 +231,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
// Install terrain module in the simulator
lock(m_scene)
{
if(m_scene.Bakedmap != null)
{
m_baked = m_scene.Bakedmap;
}
if (m_scene.Heightmap == null)
{
m_channel = new TerrainChannel(m_InitialTerrain, (int)m_scene.RegionInfo.RegionSizeX,
(int)m_scene.RegionInfo.RegionSizeY,
(int)m_scene.RegionInfo.RegionSizeZ);
if(m_baked != null)
m_channel = m_baked.MakeCopy();
else
m_channel = new TerrainChannel(m_InitialTerrain,
(int)m_scene.RegionInfo.RegionSizeX,
(int)m_scene.RegionInfo.RegionSizeY,
(int)m_scene.RegionInfo.RegionSizeZ);
m_scene.Heightmap = m_channel;
UpdateBakedMap();
}
else
{
m_channel = m_scene.Heightmap;
UpdateBakedMap();
}
if(m_baked == null)
UpdateBakedMap();
m_scene.RegisterModuleInterface<ITerrainModule>(this);
m_scene.EventManager.OnNewClient += EventManager_OnNewClient;
@@ -724,6 +731,8 @@ namespace OpenSim.Region.CoreModules.World.Terrain
m_baked = m_channel.MakeCopy();
m_painteffects[StandardTerrainEffects.Revert] = new RevertSphere(m_baked);
m_floodeffects[StandardTerrainEffects.Revert] = new RevertArea(m_baked);
m_scene.Bakedmap = m_baked;
m_scene.SaveBakedTerrain();
}
/// <summary>