aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2010-09-17 03:57:15 +0100
committerMelanie2010-09-17 03:57:15 +0100
commite32855d080c4b4cc46d67aac010942f42fd2fd8a (patch)
treeab3b1d91030d1d77a2e99cc0897ac2a9a905f742 /OpenSim
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentSend kill packets for avatars, too (diff)
downloadopensim-SC_OLD-e32855d080c4b4cc46d67aac010942f42fd2fd8a.zip
opensim-SC_OLD-e32855d080c4b4cc46d67aac010942f42fd2fd8a.tar.gz
opensim-SC_OLD-e32855d080c4b4cc46d67aac010942f42fd2fd8a.tar.bz2
opensim-SC_OLD-e32855d080c4b4cc46d67aac010942f42fd2fd8a.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs4
1 files changed, 4 insertions, 0 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index dca1346..2b1bd97 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -1541,6 +1541,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
1541 OutPacket(kill, ThrottleOutPacketType.Task); 1541 OutPacket(kill, ThrottleOutPacketType.Task);
1542 } 1542 }
1543 } 1543 }
1544 else
1545 {
1546 OutPacket(kill, ThrottleOutPacketType.State);
1547 }
1544 } 1548 }
1545 1549
1546 /// <summary> 1550 /// <summary>