diff options
| author | Melanie | 2010-11-05 14:46:13 +0100 |
|---|---|---|
| committer | Melanie | 2010-11-05 14:46:13 +0100 |
| commit | 78448720671e364862ae5c17464ccf112bbf7034 (patch) | |
| tree | 2bb72dc01006c585d981ceefbf05c888ea947823 /OpenSim/Region/ClientStack/LindenUDP | |
| parent | Revert "Spin the AddNewClient process off into a new thread to avoid locking ... (diff) | |
| download | opensim-SC_OLD-78448720671e364862ae5c17464ccf112bbf7034.zip opensim-SC_OLD-78448720671e364862ae5c17464ccf112bbf7034.tar.gz opensim-SC_OLD-78448720671e364862ae5c17464ccf112bbf7034.tar.bz2 opensim-SC_OLD-78448720671e364862ae5c17464ccf112bbf7034.tar.xz | |
Fix merge artefacts
Diffstat (limited to 'OpenSim/Region/ClientStack/LindenUDP')
| -rw-r--r-- | OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index 7e9a82a..bcfb633 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | |||
| @@ -11358,12 +11358,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP | |||
| 11358 | public void ProcessInPacket(Packet packet) | 11358 | public void ProcessInPacket(Packet packet) |
| 11359 | { | 11359 | { |
| 11360 | if (m_debugPacketLevel >= 255) | 11360 | if (m_debugPacketLevel >= 255) |
| 11361 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type); | 11361 | m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type); |
| 11362 | 11362 | ||
| 11363 | if (!ProcessPacketMethod(Pack)) | 11363 | if (!ProcessPacketMethod(packet)) |
| 11364 | m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type); | 11364 | m_log.Warn("[CLIENT]: unhandled packet " + packet.Type); |
| 11365 | 11365 | ||
| 11366 | PacketPool.Instance.ReturnPacket(Pack); | 11366 | PacketPool.Instance.ReturnPacket(packet); |
| 11367 | } | 11367 | } |
| 11368 | 11368 | ||
| 11369 | private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) | 11369 | private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) |