aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-12 23:20:38 +0000
committerJustin Clark-Casey (justincc)2010-03-12 23:20:38 +0000
commit315fa06c75d023ef3e4285842dd730a4d94b78d6 (patch)
tree370ec91ab832e2f24e57c17cf32aea5baa84953d /OpenSim/Region/Framework/Scenes/Scene.cs
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.zip
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.gz
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.bz2
opensim-SC_OLD-315fa06c75d023ef3e4285842dd730a4d94b78d6.tar.xz
refactor: Move another RezSingleAttachment() from Scene.Inventory to AttachmentsModule
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 50553dd..c510dc8 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2642,13 +2642,13 @@ namespace OpenSim.Region.Framework.Scenes
2642 } 2642 }
2643 2643
2644 public virtual void SubscribeToClientAttachmentEvents(IClientAPI client) 2644 public virtual void SubscribeToClientAttachmentEvents(IClientAPI client)
2645 { 2645 {
2646 client.OnRezSingleAttachmentFromInv += RezSingleAttachment;
2647 client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments; 2646 client.OnRezMultipleAttachmentsFromInv += RezMultipleAttachments;
2648 client.OnObjectDetach += m_sceneGraph.DetachObject; 2647 client.OnObjectDetach += m_sceneGraph.DetachObject;
2649 2648
2650 if (AttachmentsModule != null) 2649 if (AttachmentsModule != null)
2651 { 2650 {
2651 client.OnRezSingleAttachmentFromInv += AttachmentsModule.RezSingleAttachmentFromInventory;
2652 client.OnObjectAttach += AttachmentsModule.AttachObject; 2652 client.OnObjectAttach += AttachmentsModule.AttachObject;
2653 client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory; 2653 client.OnDetachAttachmentIntoInv += AttachmentsModule.ShowDetachInUserInventory;
2654 } 2654 }
@@ -2799,12 +2799,12 @@ namespace OpenSim.Region.Framework.Scenes
2799 2799
2800 public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client) 2800 public virtual void UnSubscribeToClientAttachmentEvents(IClientAPI client)
2801 { 2801 {
2802 client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments; 2802 client.OnRezMultipleAttachmentsFromInv -= RezMultipleAttachments;
2803 client.OnRezSingleAttachmentFromInv -= RezSingleAttachment;
2804 client.OnObjectDetach -= m_sceneGraph.DetachObject; 2803 client.OnObjectDetach -= m_sceneGraph.DetachObject;
2805 2804
2806 if (AttachmentsModule != null) 2805 if (AttachmentsModule != null)
2807 { 2806 {
2807 client.OnRezSingleAttachmentFromInv -= AttachmentsModule.RezSingleAttachmentFromInventory;
2808 client.OnObjectAttach -= AttachmentsModule.AttachObject; 2808 client.OnObjectAttach -= AttachmentsModule.AttachObject;
2809 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory; 2809 client.OnDetachAttachmentIntoInv -= AttachmentsModule.ShowDetachInUserInventory;
2810 } 2810 }