aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-08-30 22:25:38 +0100
committerJustin Clark-Casey (justincc)2011-08-30 22:25:38 +0100
commit1de68b34d959570c6dc5de42e8dac5e36f960273 (patch)
tree8c3aaf917e8e1433b10bf92c74e7d44d8a30a7b3 /OpenSim/Region/Framework
parentminor: comment out friends number logging from login for now (diff)
downloadopensim-SC_OLD-1de68b34d959570c6dc5de42e8dac5e36f960273.zip
opensim-SC_OLD-1de68b34d959570c6dc5de42e8dac5e36f960273.tar.gz
opensim-SC_OLD-1de68b34d959570c6dc5de42e8dac5e36f960273.tar.bz2
opensim-SC_OLD-1de68b34d959570c6dc5de42e8dac5e36f960273.tar.xz
refactor: migrate DropObject handling fully into AttachmentsModule from Scene
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs8
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
-rw-r--r--OpenSim/Region/Framework/Scenes/SceneGraph.cs7
3 files changed, 4 insertions, 13 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 86f5a0f..c910289 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Interfaces
64 /// <param name="itemID"></param> 64 /// <param name="itemID"></param>
65 /// <param name="AttachmentPt"></param> 65 /// <param name="AttachmentPt"></param>
66 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> 66 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
67 UUID RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt); 67 ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
68 68
69 /// <summary> 69 /// <summary>
70 /// Rez an attachment from user inventory 70 /// Rez an attachment from user inventory
@@ -77,7 +77,7 @@ namespace OpenSim.Region.Framework.Interfaces
77 /// False is required so that we don't attempt to update information when a user enters a scene with the 77 /// False is required so that we don't attempt to update information when a user enters a scene with the
78 /// attachment already correctly set up in inventory. 78 /// attachment already correctly set up in inventory.
79 /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns> 79 /// <returns>The uuid of the scene object that was attached. Null if the scene object could not be found</returns>
80 UUID RezSingleAttachmentFromInventory( 80 ISceneEntity RezSingleAttachmentFromInventory(
81 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus); 81 IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
82 82
83 /// <summary> 83 /// <summary>
@@ -105,9 +105,9 @@ namespace OpenSim.Region.Framework.Interfaces
105 /// <summary> 105 /// <summary>
106 /// Detach the given item to the ground. 106 /// Detach the given item to the ground.
107 /// </summary> 107 /// </summary>
108 /// <param name="sceneObjectID"></param> 108 /// <param name="objectLocalID"></param>
109 /// <param name="remoteClient"></param> 109 /// <param name="remoteClient"></param>
110 void DetachSingleAttachmentToGround(UUID sceneObjectID, IClientAPI remoteClient); 110 void DetachSingleAttachmentToGround(uint objectLocalID, IClientAPI remoteClient);
111 111
112 /// <summary> 112 /// <summary>
113 /// Detach the given item so that it remains in the user's inventory. 113 /// Detach the given item so that it remains in the user's inventory.
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 45d1a0e..e0250de 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2772,7 +2772,6 @@ namespace OpenSim.Region.Framework.Scenes
2772 client.OnUndo += m_sceneGraph.HandleUndo; 2772 client.OnUndo += m_sceneGraph.HandleUndo;
2773 client.OnRedo += m_sceneGraph.HandleRedo; 2773 client.OnRedo += m_sceneGraph.HandleRedo;
2774 client.OnObjectDescription += m_sceneGraph.PrimDescription; 2774 client.OnObjectDescription += m_sceneGraph.PrimDescription;
2775 client.OnObjectDrop += m_sceneGraph.DropObject;
2776 client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable; 2775 client.OnObjectIncludeInSearch += m_sceneGraph.MakeObjectSearchable;
2777 client.OnObjectOwner += ObjectOwner; 2776 client.OnObjectOwner += ObjectOwner;
2778 } 2777 }
@@ -2899,7 +2898,6 @@ namespace OpenSim.Region.Framework.Scenes
2899 client.OnUndo -= m_sceneGraph.HandleUndo; 2898 client.OnUndo -= m_sceneGraph.HandleUndo;
2900 client.OnRedo -= m_sceneGraph.HandleRedo; 2899 client.OnRedo -= m_sceneGraph.HandleRedo;
2901 client.OnObjectDescription -= m_sceneGraph.PrimDescription; 2900 client.OnObjectDescription -= m_sceneGraph.PrimDescription;
2902 client.OnObjectDrop -= m_sceneGraph.DropObject;
2903 client.OnObjectIncludeInSearch -= m_sceneGraph.MakeObjectSearchable; 2901 client.OnObjectIncludeInSearch -= m_sceneGraph.MakeObjectSearchable;
2904 client.OnObjectOwner -= ObjectOwner; 2902 client.OnObjectOwner -= ObjectOwner;
2905 } 2903 }
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
index 0582586..76ed55c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs
@@ -548,13 +548,6 @@ namespace OpenSim.Region.Framework.Scenes
548 m_activeScripts += number; 548 m_activeScripts += number;
549 } 549 }
550 550
551 public void DropObject(uint objectLocalID, IClientAPI remoteClient)
552 {
553 SceneObjectGroup group = GetGroupByPrim(objectLocalID);
554 if (group != null)
555 m_parentScene.AttachmentsModule.DetachSingleAttachmentToGround(group.UUID, remoteClient);
556 }
557
558 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId) 551 protected internal void HandleUndo(IClientAPI remoteClient, UUID primId)
559 { 552 {
560 if (primId != UUID.Zero) 553 if (primId != UUID.Zero)