diff options
author | UbitUmarov | 2016-08-05 15:19:42 +0100 |
---|---|---|
committer | UbitUmarov | 2016-08-05 15:19:42 +0100 |
commit | 23578635df0c98f883f7be9b6e08a4fc1a7c834c (patch) | |
tree | 4d35657b01a00ce867c526157a3df592de4b7098 /OpenSim/Region/Framework/Interfaces | |
parent | also use group provided by viewer on ObjectDuplicateOnRay (diff) | |
download | opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.zip opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.gz opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.bz2 opensim-SC-23578635df0c98f883f7be9b6e08a4fc1a7c834c.tar.xz |
more changes relative to incorrect use of activegroupid
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs index 6bad018..292b0d6 100644 --- a/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryAccessModule.cs | |||
@@ -70,6 +70,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
70 | /// </remarks> | 70 | /// </remarks> |
71 | /// <param name="remoteClient"></param> | 71 | /// <param name="remoteClient"></param> |
72 | /// <param name="itemID"></param> | 72 | /// <param name="itemID"></param> |
73 | /// <param name="rezGroupID"></param> | ||
73 | /// <param name="RayEnd"></param> | 74 | /// <param name="RayEnd"></param> |
74 | /// <param name="RayStart"></param> | 75 | /// <param name="RayStart"></param> |
75 | /// <param name="RayTargetID"></param> | 76 | /// <param name="RayTargetID"></param> |
@@ -81,6 +82,11 @@ namespace OpenSim.Region.Framework.Interfaces | |||
81 | /// <param name="attachment"></param> | 82 | /// <param name="attachment"></param> |
82 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> | 83 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> |
83 | SceneObjectGroup RezObject( | 84 | SceneObjectGroup RezObject( |
85 | IClientAPI remoteClient, UUID itemID, UUID rezGroupID, Vector3 RayEnd, Vector3 RayStart, | ||
86 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | ||
87 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | ||
88 | // compatibily do not use | ||
89 | SceneObjectGroup RezObject( | ||
84 | IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, | 90 | IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, |
85 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 91 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
86 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 92 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
@@ -97,6 +103,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
97 | /// The item from which the object asset came. Can be null, in which case pre and post rez item adjustment and checks are not performed. | 103 | /// The item from which the object asset came. Can be null, in which case pre and post rez item adjustment and checks are not performed. |
98 | /// </param> | 104 | /// </param> |
99 | /// <param name="assetID">The asset id for the object to rez.</param> | 105 | /// <param name="assetID">The asset id for the object to rez.</param> |
106 | /// <param name="rezObjectID">The requested group id for the object to rez.</param> | ||
100 | /// <param name="RayEnd"></param> | 107 | /// <param name="RayEnd"></param> |
101 | /// <param name="RayStart"></param> | 108 | /// <param name="RayStart"></param> |
102 | /// <param name="RayTargetID"></param> | 109 | /// <param name="RayTargetID"></param> |
@@ -107,8 +114,16 @@ namespace OpenSim.Region.Framework.Interfaces | |||
107 | /// <param name="fromTaskID"></param> | 114 | /// <param name="fromTaskID"></param> |
108 | /// <param name="attachment"></param> | 115 | /// <param name="attachment"></param> |
109 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> | 116 | /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns> |
117 | |||
118 | SceneObjectGroup RezObject(IClientAPI remoteClient, InventoryItemBase item, UUID rezGroupID, | ||
119 | UUID assetID, Vector3 RayEnd, Vector3 RayStart, | ||
120 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | ||
121 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | ||
122 | |||
123 | // compatibility do not use | ||
110 | SceneObjectGroup RezObject( | 124 | SceneObjectGroup RezObject( |
111 | IClientAPI remoteClient, InventoryItemBase item, UUID assetID, Vector3 RayEnd, Vector3 RayStart, | 125 | IClientAPI remoteClient, InventoryItemBase item, |
126 | UUID assetID, Vector3 RayEnd, Vector3 RayStart, | ||
112 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, | 127 | UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, |
113 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); | 128 | bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment); |
114 | 129 | ||