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

*test* back to no sog kills, little retouch on attachment updates, 

NameValue AttachItemID is a root part thing only
avinationmerge
UbitUmarov 2014-08-25 23:31:04 +01:00
parent 75cbe620c0
commit 6857afe2a4
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5411,7 +5411,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (data.ParentGroup.IsAttachment) if (data.ParentGroup.IsAttachment)
{ {
if (data.UUID == data.ParentGroup.RootPart.UUID) if (data.IsRoot)
{ {
update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID); update.NameValue = Util.StringToBytes256("AttachItemID STRING RW SV " + data.ParentGroup.FromItemID);
} }

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

@ -5982,10 +5982,10 @@ namespace OpenSim.Region.Framework.Scenes
public void SendKillTo(ScenePresence p) public void SendKillTo(ScenePresence p)
{ {
List<uint> ids = new List<uint>(m_attachments.Count + 1); List<uint> ids = new List<uint>(m_attachments.Count + 1);
foreach (SceneObjectGroup sog in m_attachments) // foreach (SceneObjectGroup sog in m_attachments)
{ // {
ids.Add(sog.RootPart.LocalId); // ids.Add(sog.RootPart.LocalId);
} // }
ids.Add(LocalId); ids.Add(LocalId);
p.ControllingClient.SendKillObject(ids); p.ControllingClient.SendKillObject(ids);