OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

limit the scan of terrain EnforceEstateLimits to the area changed.

LSLKeyTest
UbitUmarov 2016-08-21 02:10:45 +01:00
parent d9647dbf7c
commit 5d42d24428
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -963,6 +963,27 @@ namespace OpenSim.Region.CoreModules.World.Terrain
return wasLimited; return wasLimited;
} }
private bool EnforceEstateLimits(int startX, int startY, int endX, int endY)
{
TerrainData terrData = m_channel.GetTerrainData();
bool wasLimited = false;
for (int x = startX; x <= endX; x += Constants.TerrainPatchSize)
{
for (int y = startX; y <= endY; y += Constants.TerrainPatchSize)
{
if (terrData.IsTaintedAt(x, y, false /* clearOnTest */))
{
// If we should respect the estate settings then
// fixup and height deltas that don't respect them.
// Note that LimitChannelChanges() modifies the TerrainChannel with the limited height values.
wasLimited |= LimitChannelChanges(terrData, x, y);
}
}
}
return wasLimited;
}
/// <summary> /// <summary>
/// Checks to see height deltas in the tainted terrain patch at xStart ,yStart /// Checks to see height deltas in the tainted terrain patch at xStart ,yStart
/// are all within the current estate limits /// are all within the current estate limits
@ -1341,7 +1362,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
//block changes outside estate limits //block changes outside estate limits
if (!god) if (!god)
EnforceEstateLimits(); EnforceEstateLimits(startX, endX, startY, endY);
} }
} }
else else
@ -1404,7 +1425,7 @@ namespace OpenSim.Region.CoreModules.World.Terrain
//block changes outside estate limits //block changes outside estate limits
if (!god) if (!god)
EnforceEstateLimits(); EnforceEstateLimits(startX, endX, startY, endY);
} }
} }
else else