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

Merge branch 'master' into careminster-presence-refactor

avinationmerge
Melanie 2010-11-08 03:05:07 +00:00
parent 5a3cd9f1d0 6056ae8d88
commit 8a97d58f09
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
View File

@ -179,13 +179,17 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
UUID itemID = UUID.Zero; UUID itemID = UUID.Zero;
if (sp != null) if (sp != null)
{ {
foreach (SceneObjectGroup grp in sp.GetAttachments(AttachmentPt)) foreach(SceneObjectGroup grp in sp.Attachments)
{
if (grp.GetAttachmentPoint() == (byte)AttachmentPt)
{ {
itemID = grp.GetFromItemID(); itemID = grp.GetFromItemID();
break;
}
}
if (itemID != UUID.Zero) if (itemID != UUID.Zero)
DetachSingleAttachmentToInv(itemID, remoteClient); DetachSingleAttachmentToInv(itemID, remoteClient);
} }
}
if (group.GetFromItemID() == UUID.Zero) if (group.GetFromItemID() == UUID.Zero)
{ {

7
OpenSim/Region/Framework/Scenes/Scene.cs
View File

@ -5165,6 +5165,7 @@ namespace OpenSim.Region.Framework.Scenes
}); });
} }
<<<<<<< HEAD:OpenSim/Region/Framework/Scenes/Scene.cs
if (objectsToDelete.Count > 0) if (objectsToDelete.Count > 0)
{ {
m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count); m_log.DebugFormat("[SCENE]: Starting delete of {0} dropped attachments", objectsToDelete.Count);
@ -5174,6 +5175,12 @@ namespace OpenSim.Region.Framework.Scenes
DeleteSceneObject(grp, true); DeleteSceneObject(grp, true);
} }
m_log.Debug("[SCENE]: Finished dropped attachment deletion"); m_log.Debug("[SCENE]: Finished dropped attachment deletion");
=======
foreach (SceneObjectGroup grp in objectsToDelete)
{
m_log.InfoFormat("[SCENE]: Deleting dropped attachment {0} of user {1}", grp.UUID, grp.OwnerID);
DeleteSceneObject(grp, true);
>>>>>>> master:OpenSim/Region/Framework/Scenes/Scene.cs
} }
} }
} }