aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-30 17:04:26 +0100
committerJustin Clark-Casey (justincc)2010-05-20 23:32:23 +0100
commite9bac02fec9c789a6305b031f9ff5eb46f2076b4 (patch)
treea014a869cf7322cc4a934e32768cbf61c487188b /OpenSim
parentCompletely prevent full update packets being sent after kill object packets (diff)
downloadopensim-SC-e9bac02fec9c789a6305b031f9ff5eb46f2076b4.zip
opensim-SC-e9bac02fec9c789a6305b031f9ff5eb46f2076b4.tar.gz
opensim-SC-e9bac02fec9c789a6305b031f9ff5eb46f2076b4.tar.bz2
opensim-SC-e9bac02fec9c789a6305b031f9ff5eb46f2076b4.tar.xz
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
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs3
1 files changed, 0 insertions, 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;
40using OpenMetaverse.StructuredData; 40using OpenMetaverse.StructuredData;
41using OpenSim.Framework; 41using OpenSim.Framework;
42using OpenSim.Framework.Client; 42using OpenSim.Framework.Client;
43<<<<<<< HEAD:OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
44using OpenSim.Framework.Communications.Cache; 43using OpenSim.Framework.Communications.Cache;
45=======
46>>>>>>> 696d711... Completely prevent full update packets being sent after kill object packets:OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
47using OpenSim.Framework.Statistics; 44using OpenSim.Framework.Statistics;
48using OpenSim.Region.Framework.Interfaces; 45using OpenSim.Region.Framework.Interfaces;
49using OpenSim.Region.Framework.Scenes; 46using OpenSim.Region.Framework.Scenes;