OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

revert the kills, they seem even worse

avinationmerge
UbitUmarov 2014-08-22 00:28:05 +01:00
parent 0da7f8e863
commit c95fd60806
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
OpenSim/Region/Framework/Scenes/ScenePresence.cs
View File

@ -5848,18 +5848,13 @@ namespace OpenSim.Region.Framework.Scenes
public void HasMovedAway() public void HasMovedAway()
{ {
List<uint> myids = new List<uint>();
foreach (SceneObjectGroup sog in m_attachments)
myids.Add(sog.RootPart.LocalId);
myids.Add(LocalId);
List<ScenePresence> allpresences = m_scene.GetScenePresences(); List<ScenePresence> allpresences = m_scene.GetScenePresences();
foreach (ScenePresence p in allpresences) foreach (ScenePresence p in allpresences)
{ {
if (p == this) if (p == this)
continue; continue;
p.ControllingClient.SendKillObject(myids); SendKillTo(p);
p.SendFullKillsTo(this); p.SendKillTo(this);
} }
if (Scene.AttachmentsModule != null) if (Scene.AttachmentsModule != null)
Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true); Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
@ -5869,7 +5864,7 @@ namespace OpenSim.Region.Framework.Scenes
{ {
List<uint> ids = new List<uint>(); List<uint> ids = new List<uint>();
foreach (SceneObjectGroup sog in m_attachments) foreach (SceneObjectGroup sog in m_attachments)
ids.Add(sog.RootPart.LocalId); p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
ids.Add(LocalId); ids.Add(LocalId);
p.ControllingClient.SendKillObject(ids); p.ControllingClient.SendKillObject(ids);
} }