aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack/LindenUDP
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-09-21 16:58:14 +0000
committerJustin Clarke Casey2008-09-21 16:58:14 +0000
commit1a71a3a56776bc1d91f9da031a295fd4a0023e87 (patch)
tree2ba99a3fa223499313d3cc9c199c042859af148d /OpenSim/Region/ClientStack/LindenUDP
parentDon't attach attachements to child agents. This coincidentially fixes a race (diff)
downloadopensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.zip
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.gz
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.bz2
opensim-SC_OLD-1a71a3a56776bc1d91f9da031a295fd4a0023e87.tar.xz
* Fix http://opensimulator.org/mantis/view.php?id=2189
* Allow a grid mode region simulator to properly shutdown even if the grid service is offline
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
index eddee10..d885e3b 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
@@ -96,6 +96,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
96 // A list of the packets we haven't acked yet 96 // A list of the packets we haven't acked yet
97 // 97 //
98 private Dictionary<uint,uint> m_PendingAcks = new Dictionary<uint,uint>(); 98 private Dictionary<uint,uint> m_PendingAcks = new Dictionary<uint,uint>();
99
99 // Dictionary of the packets that need acks from the client. 100 // Dictionary of the packets that need acks from the client.
100 // 101 //
101 private class AckData 102 private class AckData
@@ -109,6 +110,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
109 public Packet Packet; 110 public Packet Packet;
110 public Object Identifier; 111 public Object Identifier;
111 } 112 }
113
112 private Dictionary<uint, AckData> m_NeedAck = 114 private Dictionary<uint, AckData> m_NeedAck =
113 new Dictionary<uint, AckData>(); 115 new Dictionary<uint, AckData>();
114 116