aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2015-08-27 21:30:51 +0100
committerUbitUmarov2015-08-27 21:30:51 +0100
commitf9efa23d5e0534068dbfb4058cc318588dfbb1e6 (patch)
tree787e3e2ac98e97bdfd0b53a8c03a0e348ae06614 /OpenSim/Region
parent make terrain undo non op, it is broken and can't be global but per agent (diff)
downloadopensim-SC_OLD-f9efa23d5e0534068dbfb4058cc318588dfbb1e6.zip
opensim-SC_OLD-f9efa23d5e0534068dbfb4058cc318588dfbb1e6.tar.gz
opensim-SC_OLD-f9efa23d5e0534068dbfb4058cc318588dfbb1e6.tar.bz2
opensim-SC_OLD-f9efa23d5e0534068dbfb4058cc318588dfbb1e6.tar.xz
remove the rest of #justEditedTerrain, it was sending patchs non
conforming to protocol, and no longer in agreement with how patchs are schedule to send
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs16
1 files changed, 0 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 6c81035..69f001a 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -338,8 +338,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
338 private bool m_VelocityInterpolate = false; 338 private bool m_VelocityInterpolate = false;
339 private const uint MaxTransferBytesPerPacket = 600; 339 private const uint MaxTransferBytesPerPacket = 600;
340 340
341 private volatile bool m_justEditedTerrain = false;
342
343 /// <value> 341 /// <value>
344 /// List used in construction of data blocks for an object update packet. This is to stop us having to 342 /// List used in construction of data blocks for an object update packet. This is to stop us having to
345 /// continually recreate it. 343 /// continually recreate it.
@@ -1315,18 +1313,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1315 { 1313 {
1316 try 1314 try
1317 { 1315 {
1318 if (px.Length != py.Length ||
1319 terrData.SizeX != (int)Scene.RegionInfo.RegionSizeX ||
1320 terrData.SizeY != (int)Scene.RegionInfo.RegionSizeY)
1321 {
1322 if (px.Length != py.Length)
1323 m_log.Debug("px py");
1324 if (terrData.SizeX != Scene.RegionInfo.RegionSizeX)
1325 m_log.Debug("sx");
1326 if (terrData.SizeY != Scene.RegionInfo.RegionSizeY)
1327 m_log.Debug("sx");
1328 }
1329
1330 /* test code using the terrain compressor in libOpenMetaverse 1316 /* test code using the terrain compressor in libOpenMetaverse
1331 int[] patchInd = new int[1]; 1317 int[] patchInd = new int[1];
1332 patchInd[0] = px + (py * Constants.TerrainPatchSize); 1318 patchInd[0] = px + (py * Constants.TerrainPatchSize);
@@ -6509,7 +6495,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6509 { 6495 {
6510 // Note: the ModifyTerrain event handler sends out updated packets before the end of this event. Therefore, 6496 // Note: the ModifyTerrain event handler sends out updated packets before the end of this event. Therefore,
6511 // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit. 6497 // a simple boolean value should work and perhaps queue up just a few terrain patch packets at the end of the edit.
6512 m_justEditedTerrain = true; // Prevent terrain packet (Land layer) from being queued, make it unreliable
6513 if (OnModifyTerrain != null) 6498 if (OnModifyTerrain != null)
6514 { 6499 {
6515 for (int i = 0; i < modify.ParcelData.Length; i++) 6500 for (int i = 0; i < modify.ParcelData.Length; i++)
@@ -6525,7 +6510,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
6525 } 6510 }
6526 } 6511 }
6527 } 6512 }
6528 m_justEditedTerrain = false; // Queue terrain packet (Land layer) if necessary, make it reliable again
6529 } 6513 }
6530 6514
6531 return true; 6515 return true;