diff options
author | Homer Horwitz | 2008-10-02 22:14:34 +0000 |
---|---|---|
committer | Homer Horwitz | 2008-10-02 22:14:34 +0000 |
commit | 423d950a695d38b13991bcd4b8c34d9c06e25a6b (patch) | |
tree | 491670373ef950dea0b27becb011cc2714f8e189 | |
parent | - Fix invalid cast in OSHttpRequest (diff) | |
download | opensim-SC_OLD-423d950a695d38b13991bcd4b8c34d9c06e25a6b.zip opensim-SC_OLD-423d950a695d38b13991bcd4b8c34d9c06e25a6b.tar.gz opensim-SC_OLD-423d950a695d38b13991bcd4b8c34d9c06e25a6b.tar.bz2 opensim-SC_OLD-423d950a695d38b13991bcd4b8c34d9c06e25a6b.tar.xz |
- Fixed a small off by one error in sending MapBlocks
- Removed MapBlockData.Flags; it isn't used anywhere (maybe MapBlockData.RegionFlags replaced it?)
-rw-r--r-- | OpenSim/Framework/MapBlockData.cs | 1 | ||||
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/OpenSim/Framework/MapBlockData.cs b/OpenSim/Framework/MapBlockData.cs index 7b5bfaa..2cb9985 100644 --- a/OpenSim/Framework/MapBlockData.cs +++ b/OpenSim/Framework/MapBlockData.cs | |||
@@ -34,7 +34,6 @@ namespace OpenSim.Framework | |||
34 | { | 34 | { |
35 | public byte Access; | 35 | public byte Access; |
36 | public byte Agents; | 36 | public byte Agents; |
37 | public uint Flags; | ||
38 | public UUID MapImageId; | 37 | public UUID MapImageId; |
39 | public String Name; | 38 | public String Name; |
40 | public uint RegionFlags; | 39 | public uint RegionFlags; |
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 692de46..aae41fe 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
@@ -1399,7 +1399,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
1399 | for (int i = 0; i < mapBlocks2.Length; i++) | 1399 | for (int i = 0; i < mapBlocks2.Length; i++) |
1400 | { | 1400 | { |
1401 | sendingBlocks.Add(mapBlocks2[i]); | 1401 | sendingBlocks.Add(mapBlocks2[i]); |
1402 | if (((i + 1) == mapBlocks2.Length) || ((i % maxsend) == 0)) | 1402 | if (((i + 1) == mapBlocks2.Length) || (((i + 1) % maxsend) == 0)) |
1403 | { | 1403 | { |
1404 | SendMapBlockSplit(sendingBlocks, flag); | 1404 | SendMapBlockSplit(sendingBlocks, flag); |
1405 | sendingBlocks = new List<MapBlockData>(); | 1405 | sendingBlocks = new List<MapBlockData>(); |