diff options
| author | Adam Frisby | 2008-10-12 01:09:58 +0000 |
|---|---|---|
| committer | Adam Frisby | 2008-10-12 01:09:58 +0000 |
| commit | d7aedf343a163fad95e459b00b0cc0653e910fa8 (patch) | |
| tree | 2b032db79b2d5fce28f045c31903a2838fcbee3d | |
| parent | Fix LSL bitwise Or (diff) | |
| download | opensim-SC_OLD-d7aedf343a163fad95e459b00b0cc0653e910fa8.zip opensim-SC_OLD-d7aedf343a163fad95e459b00b0cc0653e910fa8.tar.gz opensim-SC_OLD-d7aedf343a163fad95e459b00b0cc0653e910fa8.tar.bz2 opensim-SC_OLD-d7aedf343a163fad95e459b00b0cc0653e910fa8.tar.xz | |
* Small fix for when PacketPool is disabled to prevent it from crashing immedietly.
| -rw-r--r-- | OpenSim/Framework/PacketPool.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs | 2 |
2 files changed, 2 insertions, 2 deletions
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 | |||
| 55 | 55 | ||
| 56 | lock (pool) | 56 | lock (pool) |
| 57 | { | 57 | { |
| 58 | if (pool[type] == null || (pool[type]).Count == 0) | 58 | if (!pool.ContainsKey(type) || pool[type] == null || (pool[type]).Count == 0) |
| 59 | { | 59 | { |
| 60 | // Creating a new packet if we cannot reuse an old package | 60 | // Creating a new packet if we cannot reuse an old package |
| 61 | packet = Packet.BuildPacket(type); | 61 | 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 | |||
| 144 | /// <param name="port"></param> | 144 | /// <param name="port"></param> |
| 145 | /// <param name="proxyPortOffsetParm"></param> | 145 | /// <param name="proxyPortOffsetParm"></param> |
| 146 | /// <param name="allow_alternate_port"></param> | 146 | /// <param name="allow_alternate_port"></param> |
| 147 | /// <param name="settings"></param> | 147 | /// <param name="userSettings"></param> |
| 148 | /// <param name="assetCache"></param> | 148 | /// <param name="assetCache"></param> |
| 149 | /// <param name="circuitManager"></param> | 149 | /// <param name="circuitManager"></param> |
| 150 | public void Initialise( | 150 | public void Initialise( |