diff options
author | Justin Clark-Casey (justincc) | 2011-08-30 22:25:38 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2011-08-30 22:25:38 +0100 |
commit | 1de68b34d959570c6dc5de42e8dac5e36f960273 (patch) | |
tree | 8c3aaf917e8e1433b10bf92c74e7d44d8a30a7b3 /OpenSim/Region/Framework/Scenes | |
parent | minor: comment out friends number logging from login for now (diff) | |
download | opensim-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/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 7 |
2 files changed, 0 insertions, 9 deletions
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) |