ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 08:55:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge artefacts

Browse Source
This commit is contained in:
Melanie
2010-11-05 14:46:13 +01:00
parent ddd3c6824a
commit 7844872067
2 changed files with 22 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
View File

@@ -11358,12 +11358,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
public void ProcessInPacket(Packet packet)
{
if (m_debugPacketLevel >= 255)
m_log.DebugFormat("[CLIENT]: Packet IN {0}", Pack.Type);
m_log.DebugFormat("[CLIENT]: Packet IN {0}", packet.Type);
if (!ProcessPacketMethod(Pack))
m_log.Warn("[CLIENT]: unhandled packet " + Pack.Type);
if (!ProcessPacketMethod(packet))
m_log.Warn("[CLIENT]: unhandled packet " + packet.Type);
PacketPool.Instance.ReturnPacket(Pack);
PacketPool.Instance.ReturnPacket(packet);
}
private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket)