diff options
author | UbitUmarov | 2014-08-22 00:28:05 +0100 |
---|---|---|
committer | UbitUmarov | 2014-08-22 00:28:05 +0100 |
commit | c95fd60806d28c7e68b8a03d9a0e2d41604ac92c (patch) | |
tree | e7e24666021f691c5b5169ce6db3c7acff69eed6 /OpenSim | |
parent | silly... (diff) | |
download | opensim-SC-c95fd60806d28c7e68b8a03d9a0e2d41604ac92c.zip opensim-SC-c95fd60806d28c7e68b8a03d9a0e2d41604ac92c.tar.gz opensim-SC-c95fd60806d28c7e68b8a03d9a0e2d41604ac92c.tar.bz2 opensim-SC-c95fd60806d28c7e68b8a03d9a0e2d41604ac92c.tar.xz |
revert the kills, they seem even worse
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/ScenePresence.cs | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs index d3ed228..5bfc640 100644 --- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs +++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs | |||
@@ -5848,18 +5848,13 @@ namespace OpenSim.Region.Framework.Scenes | |||
5848 | 5848 | ||
5849 | public void HasMovedAway() | 5849 | public void HasMovedAway() |
5850 | { | 5850 | { |
5851 | List<uint> myids = new List<uint>(); | ||
5852 | foreach (SceneObjectGroup sog in m_attachments) | ||
5853 | myids.Add(sog.RootPart.LocalId); | ||
5854 | myids.Add(LocalId); | ||
5855 | |||
5856 | List<ScenePresence> allpresences = m_scene.GetScenePresences(); | 5851 | List<ScenePresence> allpresences = m_scene.GetScenePresences(); |
5857 | foreach (ScenePresence p in allpresences) | 5852 | foreach (ScenePresence p in allpresences) |
5858 | { | 5853 | { |
5859 | if (p == this) | 5854 | if (p == this) |
5860 | continue; | 5855 | continue; |
5861 | p.ControllingClient.SendKillObject(myids); | 5856 | SendKillTo(p); |
5862 | p.SendFullKillsTo(this); | 5857 | p.SendKillTo(this); |
5863 | } | 5858 | } |
5864 | if (Scene.AttachmentsModule != null) | 5859 | if (Scene.AttachmentsModule != null) |
5865 | Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true); | 5860 | Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true); |
@@ -5869,7 +5864,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
5869 | { | 5864 | { |
5870 | List<uint> ids = new List<uint>(); | 5865 | List<uint> ids = new List<uint>(); |
5871 | foreach (SceneObjectGroup sog in m_attachments) | 5866 | foreach (SceneObjectGroup sog in m_attachments) |
5872 | ids.Add(sog.RootPart.LocalId); | 5867 | p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1); |
5873 | ids.Add(LocalId); | 5868 | ids.Add(LocalId); |
5874 | p.ControllingClient.SendKillObject(ids); | 5869 | p.ControllingClient.SendKillObject(ids); |
5875 | } | 5870 | } |