diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index 3b7fe8872b..3c2cc42dc0 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -67,6 +67,36 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
get { return false; }
}
+ public void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
+ {
+ m_log.Debug("[ATTACHMENTS MODULE]: Invoking AttachObject");
+
+ // If we can't take it, we can't attach it!
+ SceneObjectPart part = m_scene.GetSceneObjectPart(objectLocalID);
+ if (part == null)
+ return;
+
+ if (!m_scene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
+ return;
+
+ // Calls attach with a Zero position
+ if (AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
+ {
+ m_scene.EventManager.TriggerOnAttach(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
+
+ // Save avatar attachment information
+ ScenePresence presence;
+ if (m_scene.AvatarFactory != null && m_scene.TryGetAvatar(remoteClient.AgentId, out presence))
+ {
+ m_log.Info(
+ "[ATTACHMENTS MODULE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
+ + ", AttachmentPoint: " + AttachmentPt);
+
+ m_scene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
+ }
+ }
+ }
+
public bool AttachObject(
IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent)
{
@@ -143,7 +173,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
SceneObjectGroup att, IClientAPI remoteClient, UUID itemID, uint AttachmentPt)
{
m_log.DebugFormat(
- "[ATTACHMENTS MODULEY]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
+ "[ATTACHMENTS MODULE]: Updating inventory of {0} to show attachment of {1} (item ID {2})",
remoteClient.Name, att.Name, itemID);
if (!att.IsDeleted)
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 6cf2a2e3a0..21c10569c7 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -34,6 +34,17 @@ namespace OpenSim.Region.Framework.Interfaces
{
public interface IAttachmentsModule
{
+ ///
+ /// Attach an object to an avatar from the world.
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ void AttachObject(
+ IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent);
+
///
/// Attach an object to an avatar.
///
@@ -41,11 +52,11 @@ namespace OpenSim.Region.Framework.Interfaces
///
///
///
- ///
+ ///
///
- /// true if the object was successfully attached, false otherwise
+ /// true if the object was successfully attached, false otherwise
bool AttachObject(
- IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent);
+ IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, Vector3 attachPos, bool silent);
///
/// Update the user inventory to the attachment of an item
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 87a753e5eb..d4d134fc8b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2644,12 +2644,14 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
{
client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
- client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
- client.OnObjectAttach += m_sceneGraph.AttachObject;
+ client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
client.OnObjectDetach += m_sceneGraph.DetachObject;
if (AttachmentsModule != null)
+ {
+ client.OnObjectAttach += AttachmentsModule.AttachObject;
client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory;
+ }
}
public virtual void SubscribeToClientTeleportEvents(IClientAPI client)
@@ -2774,7 +2776,6 @@ namespace OpenSim.Region.Framework.Scenes
client.OnRezObject -= RezObject;
}
-
public virtual void UnSubscribeToClientInventoryEvents(IClientAPI client)
{
client.OnCreateNewInventoryItem -= CreateNewInventoryItem;
@@ -2799,12 +2800,14 @@ namespace OpenSim.Region.Framework.Scenes
public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
{
client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;
- client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;
- client.OnObjectAttach -= m_sceneGraph.AttachObject;
+ client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;
client.OnObjectDetach -= m_sceneGraph.DetachObject;
if (AttachmentsModule != null)
+ {
+ client.OnObjectAttach -= AttachmentsModule.AttachObject;
client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
+ }
}
public virtual void UnSubscribeToClientTeleportEvents(IClientAPI client)
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 380722d53b..a88d456e10 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -486,41 +486,6 @@ namespace OpenSim.Region.Framework.Scenes
}
}
- ///
- /// Event Handling routine for Attach Object
- ///
- ///
- ///
- ///
- ///
- protected internal void AttachObject(IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, Quaternion rot, bool silent)
- {
- // If we can't take it, we can't attach it!
- SceneObjectPart part = m_parentScene.GetSceneObjectPart(objectLocalID);
- if (part == null)
- return;
-
- if (!m_parentScene.Permissions.CanTakeObject(part.UUID, remoteClient.AgentId))
- return;
-
- // Calls attach with a Zero position
- if (m_parentScene.AttachmentsModule.AttachObject(remoteClient, objectLocalID, AttachmentPt, rot, Vector3.Zero, false))
- {
- m_parentScene.SendAttachEvent(objectLocalID, part.ParentGroup.GetFromItemID(), remoteClient.AgentId);
-
- // Save avatar attachment information
- ScenePresence presence;
- if (m_parentScene.AvatarFactory != null && m_parentScene.TryGetAvatar(remoteClient.AgentId, out presence))
- {
- m_log.Info(
- "[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId
- + ", AttachmentPoint: " + AttachmentPt);
-
- m_parentScene.AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
- }
- }
- }
-
///
/// Rez an attachment
///