aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorDiva Canto2014-06-21 15:38:38 -0700
committerDiva Canto2014-06-21 15:38:38 -0700
commitca2379ee8388d9c04fbd3c6eae49b7407bde5b95 (patch)
tree0838492d1e9e871034743c8a7a694f570be6505c /OpenSim/Region/ClientStack
parentBulletSim: add some locking for collision lists to prevent collsions (diff)
downloadopensim-SC-ca2379ee8388d9c04fbd3c6eae49b7407bde5b95.zip
opensim-SC-ca2379ee8388d9c04fbd3c6eae49b7407bde5b95.tar.gz
opensim-SC-ca2379ee8388d9c04fbd3c6eae49b7407bde5b95.tar.bz2
opensim-SC-ca2379ee8388d9c04fbd3c6eae49b7407bde5b95.tar.xz
Bug fix in map teleports in varregions. The cherry was missing from the ice-cream Sunday: the packet itself was hardcoding the size of the region...
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs5
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
index 44386c9..bd0f5ca 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
@@ -1543,10 +1543,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1543 mapReply.Data[i].Access = mapBlocks2[i].Access; 1543 mapReply.Data[i].Access = mapBlocks2[i].Access;
1544 mapReply.Data[i].Agents = mapBlocks2[i].Agents; 1544 mapReply.Data[i].Agents = mapBlocks2[i].Agents;
1545 1545
1546 // TODO: hookup varregion sim size here
1547 mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock(); 1546 mapReply.Size[i] = new MapBlockReplyPacket.SizeBlock();
1548 mapReply.Size[i].SizeX = 256; 1547 mapReply.Size[i].SizeX = mapBlocks2[i].SizeX;
1549 mapReply.Size[i].SizeY = 256; 1548 mapReply.Size[i].SizeY = mapBlocks2[i].SizeY;
1550 } 1549 }
1551 OutPacket(mapReply, ThrottleOutPacketType.Land); 1550 OutPacket(mapReply, ThrottleOutPacketType.Land);
1552 } 1551 }