aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorUbitUmarov2014-08-23 12:03:55 +0100
committerUbitUmarov2014-08-23 12:03:55 +0100
commit8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7 (patch)
tree625b490d91b24a112518b9d4312a029f21ca9331 /OpenSim/Region
parentsop SendFullUpdate() goes by presence if it is a attachment (diff)
downloadopensim-SC-8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7.zip
opensim-SC-8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7.tar.gz
opensim-SC-8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7.tar.bz2
opensim-SC-8fd836c29921fdf7c52d7ca99b9c88dd87f8a3c7.tar.xz
back to sending attachment sog kills in place of the hack. This is the
official way of doing it
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/Framework/Scenes/ScenePresence.cs13
1 files changed, 8 insertions, 5 deletions
diff --git a/OpenSim/Region/Framework/Scenes/ScenePresence.cs b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
index d471930..4632402 100644
--- a/OpenSim/Region/Framework/Scenes/ScenePresence.cs
+++ b/OpenSim/Region/Framework/Scenes/ScenePresence.cs
@@ -5965,22 +5965,25 @@ namespace OpenSim.Region.Framework.Scenes
5965 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true); 5965 Scene.AttachmentsModule.DeleteAttachmentsFromScene(this, true);
5966 } 5966 }
5967 5967
5968 public void SendFullKillsTo(ScenePresence p) 5968// kill with attachs root kills
5969 public void SendKillTo(ScenePresence p)
5969 { 5970 {
5970 List<uint> ids = new List<uint>(); 5971 List<uint> ids = new List<uint>(m_attachments.Count + 1);
5971 foreach (SceneObjectGroup sog in m_attachments)
5972 p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
5973 ids.Add(LocalId); 5972 ids.Add(LocalId);
5973 foreach (SceneObjectGroup sog in m_attachments)
5974 ids.Add(sog.RootPart.LocalId);
5974 p.ControllingClient.SendKillObject(ids); 5975 p.ControllingClient.SendKillObject(ids);
5975 } 5976 }
5976 5977
5978/*
5979// kill with hack
5977 public void SendKillTo(ScenePresence p) 5980 public void SendKillTo(ScenePresence p)
5978 { 5981 {
5979 foreach (SceneObjectGroup sog in m_attachments) 5982 foreach (SceneObjectGroup sog in m_attachments)
5980 p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1); 5983 p.ControllingClient.SendPartFullUpdate(sog.RootPart, LocalId + 1);
5981 p.ControllingClient.SendKillObject(new List<uint> { LocalId }); 5984 p.ControllingClient.SendKillObject(new List<uint> { LocalId });
5982 } 5985 }
5983 5986*/
5984 public void SendViewTo(ScenePresence p) 5987 public void SendViewTo(ScenePresence p)
5985 { 5988 {
5986 SendAvatarDataToAgentNF(p); 5989 SendAvatarDataToAgentNF(p);