From 78448720671e364862ae5c17464ccf112bbf7034 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Fri, 5 Nov 2010 14:46:13 +0100
Subject: Fix merge artefacts

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'OpenSim/Region/ClientStack')

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
         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)
-- 
cgit v1.1