diff options
author | John Hurliman | 2009-10-06 13:39:10 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-06 13:39:10 -0700 |
commit | 25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494 (patch) | |
tree | e74a0a0c59fcf471201d7d67a4b5ce938abd265c /OpenSim/Region/ClientStack | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into htb-thr... (diff) | |
download | opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.zip opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.gz opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.bz2 opensim-SC-25676ac5cf61a35f1e6e3cd7f7aba95c31bdf494.tar.xz |
* Added a sanity check for Mono before trying to enumerate over an empty SortedDictionary
* Changed the order of a log line from DotNetEngine so you can tell whether or not it is actually loading
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs index b7df84d..6ecc0c8 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/UnackedPacketCollection.cs | |||
@@ -111,6 +111,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
111 | { | 111 | { |
112 | lock (SyncRoot) | 112 | lock (SyncRoot) |
113 | { | 113 | { |
114 | if (packets.Count == 0) | ||
115 | return null; | ||
116 | |||
114 | using (SortedDictionary<uint, OutgoingPacket>.ValueCollection.Enumerator e = packets.Values.GetEnumerator()) | 117 | using (SortedDictionary<uint, OutgoingPacket>.ValueCollection.Enumerator e = packets.Values.GetEnumerator()) |
115 | return e.Current; | 118 | return e.Current; |
116 | } | 119 | } |