aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework
diff options
context:
space:
mode:
authorDan Lake2011-10-03 16:44:32 -0700
committerDan Lake2011-10-03 16:44:32 -0700
commit460946ad62b682c7a942751f192ca9e96b662f0e (patch)
tree3ea7d72402d5b61221bb2c0bcd5fb9b5e7551d5f /OpenSim/Region/Framework
parentRemove usage of Linden packet types from inside Attachments Module and interface (diff)
downloadopensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.zip
opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.gz
opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.bz2
opensim-SC_OLD-460946ad62b682c7a942751f192ca9e96b662f0e.tar.xz
Removed redundant code in AttachmentsModule and simplified interfaces which converted back and forth between ScenePresence and IClientAPI. More to be done still.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r--OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs35
-rw-r--r--OpenSim/Region/Framework/Scenes/Scene.cs2
2 files changed, 7 insertions, 30 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 8d3366c..1a0423f 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -58,17 +58,6 @@ namespace OpenSim.Region.Framework.Interfaces
58 void DeleteAttachmentsFromScene(IScenePresence sp, bool silent); 58 void DeleteAttachmentsFromScene(IScenePresence sp, bool silent);
59 59
60 /// <summary> 60 /// <summary>
61 /// Attach an object to an avatar from the world.
62 /// </summary>
63 /// <param name="controllingClient"></param>
64 /// <param name="localID"></param>
65 /// <param name="attachPoint"></param>
66 /// <param name="rot"></param>
67 /// <param name="silent"></param>
68 void AttachObject(
69 IClientAPI remoteClient, uint objectLocalID, uint AttachmentPt, bool silent);
70
71 /// <summary>
72 /// Attach an object to an avatar 61 /// Attach an object to an avatar
73 /// </summary> 62 /// </summary>
74 /// <param name="remoteClient"></param> 63 /// <param name="remoteClient"></param>
@@ -76,17 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces
76 /// <param name="AttachmentPt"></param> 65 /// <param name="AttachmentPt"></param>
77 /// <param name="silent"></param> 66 /// <param name="silent"></param>
78 /// <returns>true if the object was successfully attached, false otherwise</returns> 67 /// <returns>true if the object was successfully attached, false otherwise</returns>
79 bool AttachObject( 68 bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent);
80 IClientAPI remoteClient, SceneObjectGroup grp, uint AttachmentPt, bool silent);
81
82 /// <summary>
83 /// Rez an attachment from user inventory and change inventory status to match.
84 /// </summary>
85 /// <param name="remoteClient"></param>
86 /// <param name="itemID"></param>
87 /// <param name="AttachmentPt"></param>
88 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
89 ISceneEntity RezSingleAttachmentFromInventory(IClientAPI remoteClient, UUID itemID, uint AttachmentPt);
90 69
91 /// <summary> 70 /// <summary>
92 /// Rez an attachment from user inventory and change inventory status to match. 71 /// Rez an attachment from user inventory and change inventory status to match.
@@ -95,17 +74,15 @@ namespace OpenSim.Region.Framework.Interfaces
95 /// <param name="itemID"></param> 74 /// <param name="itemID"></param>
96 /// <param name="AttachmentPt"></param> 75 /// <param name="AttachmentPt"></param>
97 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns> 76 /// <returns>The scene object that was attached. Null if the scene object could not be found</returns>
98 ISceneEntity RezSingleAttachmentFromInventory(ScenePresence sp, UUID itemID, uint AttachmentPt); 77 ISceneEntity RezSingleAttachmentFromInventory(IScenePresence sp, UUID itemID, uint AttachmentPt);
99 78
100 /// <summary> 79 /// <summary>
101 /// Rez multiple attachments from a user's inventory 80 /// Rez multiple attachments from a user's inventory
102 /// </summary> 81 /// </summary>
103 /// <param name="remoteClient"></param> 82 /// <param name="sp"></param>
104 /// <param name="header"></param> 83 /// <param name="header"></param>
105 /// <param name="objects"></param> 84 /// <param name="objects"></param>
106 void RezMultipleAttachmentsFromInventory( 85 void RezMultipleAttachmentsFromInventory(IScenePresence sp,List<KeyValuePair<UUID, uint>> rezlist);
107 IClientAPI remoteClient,
108 List<KeyValuePair<UUID, uint>> rezlist);
109 86
110 /// <summary> 87 /// <summary>
111 /// Detach an object from the avatar. 88 /// Detach an object from the avatar.
@@ -121,9 +98,9 @@ namespace OpenSim.Region.Framework.Interfaces
121 /// <summary> 98 /// <summary>
122 /// Detach the given item to the ground. 99 /// Detach the given item to the ground.
123 /// </summary> 100 /// </summary>
101 /// <param name="sp"></param>
124 /// <param name="objectLocalID"></param> 102 /// <param name="objectLocalID"></param>
125 /// <param name="remoteClient"></param> 103 void DetachSingleAttachmentToGround(IScenePresence sp, uint objectLocalID);
126 void DetachSingleAttachmentToGround(uint objectLocalID, IClientAPI remoteClient);
127 104
128 /// <summary> 105 /// <summary>
129 /// Detach the given item so that it remains in the user's inventory. 106 /// 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 eadec09..0e5a7d2 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -2451,7 +2451,7 @@ namespace OpenSim.Region.Framework.Scenes
2451 RootPrim.RemFlag(PrimFlags.TemporaryOnRez); 2451 RootPrim.RemFlag(PrimFlags.TemporaryOnRez);
2452 2452
2453 if (AttachmentsModule != null) 2453 if (AttachmentsModule != null)
2454 AttachmentsModule.AttachObject(sp.ControllingClient, grp, 0, false); 2454 AttachmentsModule.AttachObject(sp, grp, 0, false);
2455 } 2455 }
2456 else 2456 else
2457 { 2457 {