aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/Linden/UDP
diff options
context:
space:
mode:
authorRobert Adams2014-04-12 17:37:57 -0700
committerRobert Adams2014-04-12 17:37:57 -0700
commitc8914d22ebb66fd9601161c9826d8b29ff6cb561 (patch)
treeca52fe7a5b864bf7f0c208a13c9e1fd361091d89 /OpenSim/Region/ClientStack/Linden/UDP
parentRefactor: Rename GetOtherSetting to GetSetting and make SetOtherSetting private (diff)
downloadopensim-SC-c8914d22ebb66fd9601161c9826d8b29ff6cb561.zip
opensim-SC-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.gz
opensim-SC-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.bz2
opensim-SC-c8914d22ebb66fd9601161c9826d8b29ff6cb561.tar.xz
BulletSim: reduce the terrain collison margin to be the same as other
objects in the world. This was originally changed in an attempt to make vehicles work better but the effect was not that large and it causes avatars to float above the terrain.
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/UDP')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index d9fe4e2..f80f5a0 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1251,6 +1251,11 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1251 { 1251 {
1252 try 1252 try
1253 { 1253 {
1254 /* test code using the terrain compressor in libOpenMetaverse
1255 int[] patchInd = new int[1];
1256 patchInd[0] = px + (py * Constants.TerrainPatchSize);
1257 LayerDataPacket layerpack = TerrainCompressor.CreateLandPacket(terrData.GetFloatsSerialized(), patchInd);
1258 */
1254 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, px, py); 1259 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLandPacket(terrData, px, py);
1255 1260
1256 // When a user edits the terrain, so much data is sent, the data queues up fast and presents a sub optimal editing experience. 1261 // When a user edits the terrain, so much data is sent, the data queues up fast and presents a sub optimal editing experience.
@@ -1322,6 +1327,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1322 if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize) 1327 if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize)
1323 layerType = (byte)TerrainPatch.LayerType.WindExtended; 1328 layerType = (byte)TerrainPatch.LayerType.WindExtended;
1324 1329
1330 // LayerDataPacket layerpack = TerrainCompressor.CreateLayerDataPacket(patches, (TerrainPatch.LayerType)layerType);
1325 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType, 1331 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType,
1326 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY); 1332 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY);
1327 layerpack.Header.Zerocoded = true; 1333 layerpack.Header.Zerocoded = true;
@@ -1351,6 +1357,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1351 if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize) 1357 if (m_scene.RegionInfo.RegionSizeX > Constants.RegionSize || m_scene.RegionInfo.RegionSizeY > Constants.RegionSize)
1352 layerType = (byte)TerrainPatch.LayerType.CloudExtended; 1358 layerType = (byte)TerrainPatch.LayerType.CloudExtended;
1353 1359
1360 // LayerDataPacket layerpack = TerrainCompressor.CreateLayerDataPacket(patches, (TerrainPatch.LayerType)layerType);
1354 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType, 1361 LayerDataPacket layerpack = OpenSimTerrainCompressor.CreateLayerDataPacket(patches, layerType,
1355 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY); 1362 (int)m_scene.RegionInfo.RegionSizeX, (int)m_scene.RegionInfo.RegionSizeY);
1356 layerpack.Header.Zerocoded = true; 1363 layerpack.Header.Zerocoded = true;