aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/Scene.Inventory.cs')
-rw-r--r--OpenSim/Region/Environment/Scenes/Scene.Inventory.cs44
1 files changed, 24 insertions, 20 deletions
diff --git a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
index 5e16082..c98c4f3 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.Inventory.cs
@@ -284,6 +284,7 @@ namespace OpenSim.Region.Environment.Scenes
284 { 284 {
285 part.Inventory.RemoveScriptInstance(item.ItemID); 285 part.Inventory.RemoveScriptInstance(item.ItemID);
286 } 286 }
287
287 // Update item with new asset 288 // Update item with new asset
288 item.AssetID = asset.FullID; 289 item.AssetID = asset.FullID;
289 group.UpdateInventoryItem(item); 290 group.UpdateInventoryItem(item);
@@ -2050,21 +2051,21 @@ namespace OpenSim.Region.Environment.Scenes
2050 RezSelected, RemoveItem, fromTaskID, false); 2051 RezSelected, RemoveItem, fromTaskID, false);
2051 } 2052 }
2052 2053
2053 /// <summary> 2054 /// <summary>
2054 /// Returns SceneObjectGroup or null from asset request. 2055 /// Rez an object into the scene from the user's inventory
2055 /// </summary> 2056 /// </summary>
2056 /// <param name="remoteClient"></param> 2057 /// <param name="remoteClient"></param>
2057 /// <param name="itemID"></param> 2058 /// <param name="itemID"></param>
2058 /// <param name="RayEnd"></param> 2059 /// <param name="RayEnd"></param>
2059 /// <param name="RayStart"></param> 2060 /// <param name="RayStart"></param>
2060 /// <param name="RayTargetID"></param> 2061 /// <param name="RayTargetID"></param>
2061 /// <param name="BypassRayCast"></param> 2062 /// <param name="BypassRayCast"></param>
2062 /// <param name="RayEndIsIntersection"></param> 2063 /// <param name="RayEndIsIntersection"></param>
2063 /// <param name="RezSelected"></param> 2064 /// <param name="RezSelected"></param>
2064 /// <param name="RemoveItem"></param> 2065 /// <param name="RemoveItem"></param>
2065 /// <param name="fromTaskID"></param> 2066 /// <param name="fromTaskID"></param>
2066 /// <param name="difference"></param> 2067 /// <param name="attachment"></param>
2067 /// <returns></returns> 2068 /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful.</returns>
2068 public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart, 2069 public virtual SceneObjectGroup RezObject(IClientAPI remoteClient, UUID itemID, Vector3 RayEnd, Vector3 RayStart,
2069 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection, 2070 UUID RayTargetID, byte BypassRayCast, bool RayEndIsIntersection,
2070 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment) 2071 bool RezSelected, bool RemoveItem, UUID fromTaskID, bool attachment)
@@ -2141,7 +2142,7 @@ namespace OpenSim.Region.Environment.Scenes
2141 if (attachment) 2142 if (attachment)
2142 isAttachment = " Object was an attachment"; 2143 isAttachment = " Object was an attachment";
2143 2144
2144 m_log.Error("[OJECTREZ]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment); 2145 m_log.Error("[AGENT INVENTORY]: Error rezzing ItemID: " + itemID + " object has no rootpart." + isAttachment);
2145 } 2146 }
2146 2147
2147 // Since renaming the item in the inventory does not affect the name stored 2148 // Since renaming the item in the inventory does not affect the name stored
@@ -2200,11 +2201,12 @@ namespace OpenSim.Region.Environment.Scenes
2200 group.ClearPartAttachmentData(); 2201 group.ClearPartAttachmentData();
2201 } 2202 }
2202 } 2203 }
2203 2204
2204 // Fire on_rez
2205 if (!attachment) 2205 if (!attachment)
2206 { 2206 {
2207 // Fire on_rez
2207 group.CreateScriptInstances(0, true, DefaultScriptEngine, 0); 2208 group.CreateScriptInstances(0, true, DefaultScriptEngine, 0);
2209
2208 rootPart.ScheduleFullUpdate(); 2210 rootPart.ScheduleFullUpdate();
2209 } 2211 }
2210 2212
@@ -2230,14 +2232,15 @@ namespace OpenSim.Region.Environment.Scenes
2230 } 2232 }
2231 2233
2232 /// <summary> 2234 /// <summary>
2233 /// Rez an object in the scene 2235 /// Rez an object into the scene from a prim's inventory.
2234 /// </summary> 2236 /// </summary>
2237 /// <param name="sourcePart"></param>
2235 /// <param name="item"></param> 2238 /// <param name="item"></param>
2236 /// <param name="pos"></param> 2239 /// <param name="pos"></param>
2237 /// <param name="rot"></param> 2240 /// <param name="rot"></param>
2238 /// <param name="vel"></param> 2241 /// <param name="vel"></param>
2239 /// <param name="param"></param> 2242 /// <param name="param"></param>
2240 /// <returns></returns> 2243 /// <returns>The SceneObjectGroup rezzed or null if rez was unsuccessful</returns>
2241 public virtual SceneObjectGroup RezObject( 2244 public virtual SceneObjectGroup RezObject(
2242 SceneObjectPart sourcePart, TaskInventoryItem item, 2245 SceneObjectPart sourcePart, TaskInventoryItem item,
2243 Vector3 pos, Quaternion rot, Vector3 vel, int param) 2246 Vector3 pos, Quaternion rot, Vector3 vel, int param)
@@ -2338,6 +2341,7 @@ namespace OpenSim.Region.Environment.Scenes
2338 DeRezObject(null, grp.RootPart.LocalId, 2341 DeRezObject(null, grp.RootPart.LocalId,
2339 grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero); 2342 grp.RootPart.GroupID, DeRezAction.Return, UUID.Zero);
2340 } 2343 }
2344
2341 return true; 2345 return true;
2342 } 2346 }
2343 2347