From d7aedf343a163fad95e459b00b0cc0653e910fa8 Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Sun, 12 Oct 2008 01:09:58 +0000
Subject: * Small fix for when PacketPool is disabled to prevent it from
 crashing immedietly.

---
 OpenSim/Framework/PacketPool.cs                     | 2 +-
 OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'OpenSim')

diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs
index 597375c..fc4a53b 100644
--- a/OpenSim/Framework/PacketPool.cs
+++ b/OpenSim/Framework/PacketPool.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Framework
 
             lock (pool)
             {
-                if (pool[type] == null || (pool[type]).Count == 0)
+                if (!pool.ContainsKey(type) || pool[type] == null || (pool[type]).Count == 0)
                 {
                     // Creating a new packet if we cannot reuse an old package
                     packet = Packet.BuildPacket(type);
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index d64e0a4..4abc0f7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -144,7 +144,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
         /// <param name="port"></param>
         /// <param name="proxyPortOffsetParm"></param>
         /// <param name="allow_alternate_port"></param>
-        /// <param name="settings"></param>
+        /// <param name="userSettings"></param>
         /// <param name="assetCache"></param>
         /// <param name="circuitManager"></param>
         public void Initialise(
-- 
cgit v1.1