From e9bac02fec9c789a6305b031f9ff5eb46f2076b4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Tue, 30 Mar 2010 17:04:26 +0100
Subject: Completely prevent full update packets being sent after kill object
 packets If a full update is sent after the kill, the object remains as in the
 linden viewer but in an undeletable and unowned state until relog This patch
 prevents this by recording kills in LLClientView Backport from master

---
 OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index eda9caa..8aa1b38 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -40,10 +40,7 @@ using OpenMetaverse.Packets;
 using OpenMetaverse.StructuredData;
 using OpenSim.Framework;
 using OpenSim.Framework.Client;
-<<<<<<< HEAD:OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
 using OpenSim.Framework.Communications.Cache;
-=======
->>>>>>> 696d711... Completely prevent full update packets being sent after kill object packets:OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
 using OpenSim.Framework.Statistics;
 using OpenSim.Region.Framework.Interfaces;
 using OpenSim.Region.Framework.Scenes;
-- 
cgit v1.1