aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-03-06 00:07:47 +0000
committerJustin Clark-Casey (justincc)2010-03-06 00:07:47 +0000
commit395f343498bc429c0360201991147c6e089b0730 (patch)
tree70dedf88258e3496a5cbd267bc5db7e067b88e57 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
parentMerge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-395f343498bc429c0360201991147c6e089b0730.zip
opensim-SC_OLD-395f343498bc429c0360201991147c6e089b0730.tar.gz
opensim-SC_OLD-395f343498bc429c0360201991147c6e089b0730.tar.bz2
opensim-SC_OLD-395f343498bc429c0360201991147c6e089b0730.tar.xz
refactor: Move DetachSingleAttachmentToInv to region module
need to rationalize method names later
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.Inventory.cs20
1 files changed, 1 insertions, 19 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
index bd3b433..dad0efd 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
@@ -1858,7 +1858,7 @@ namespace OpenSim.Region.Framework.Scenes
1858 1858
1859 if (att == null) 1859 if (att == null)
1860 { 1860 {
1861 DetachSingleAttachmentToInv(itemID, remoteClient); 1861 AttachmentsModule.ShowDetachInUserInventory(itemID, remoteClient);
1862 return UUID.Zero; 1862 return UUID.Zero;
1863 } 1863 }
1864 1864
@@ -1904,24 +1904,6 @@ namespace OpenSim.Region.Framework.Scenes
1904 SendAttachEvent(part.ParentGroup.LocalId, itemID, UUID.Zero); 1904 SendAttachEvent(part.ParentGroup.LocalId, itemID, UUID.Zero);
1905 } 1905 }
1906 1906
1907 public void DetachSingleAttachmentToInv(UUID itemID, IClientAPI remoteClient)
1908 {
1909 ScenePresence presence;
1910 if (TryGetAvatar(remoteClient.AgentId, out presence))
1911 {
1912 presence.Appearance.DetachAttachment(itemID);
1913
1914 // Save avatar attachment information
1915 if (m_AvatarFactory != null)
1916 {
1917 m_log.Info("[SCENE]: Saving avatar attachment. AgentID: " + remoteClient.AgentId + ", ItemID: " + itemID);
1918 m_AvatarFactory.UpdateDatabase(remoteClient.AgentId, presence.Appearance);
1919 }
1920 }
1921
1922 m_sceneGraph.DetachSingleAttachmentToInv(itemID, remoteClient);
1923 }
1924
1925 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID) 1907 public void GetScriptRunning(IClientAPI controllingClient, UUID objectID, UUID itemID)
1926 { 1908 {
1927 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID); 1909 EventManager.TriggerGetScriptRunning(controllingClient, objectID, itemID);