diff options
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/Scene.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 45806dd..e032a07 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -197,7 +197,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
197 | 197 | ||
198 | if (isScriptRunning) | 198 | if (isScriptRunning) |
199 | { | 199 | { |
200 | part.Inventory.RemoveScriptInstance(item.ItemID); | 200 | part.Inventory.RemoveScriptInstance(item.ItemID, false); |
201 | } | 201 | } |
202 | 202 | ||
203 | // Update item with new asset | 203 | // Update item with new asset |
@@ -794,8 +794,10 @@ namespace OpenSim.Region.Framework.Scenes | |||
794 | 794 | ||
795 | if (item.Type == 10) | 795 | if (item.Type == 10) |
796 | { | 796 | { |
797 | part.RemoveScriptEvents(itemID); | ||
797 | EventManager.TriggerRemoveScript(localID, itemID); | 798 | EventManager.TriggerRemoveScript(localID, itemID); |
798 | } | 799 | } |
800 | |||
799 | group.RemoveInventoryItem(localID, itemID); | 801 | group.RemoveInventoryItem(localID, itemID); |
800 | part.GetProperties(remoteClient); | 802 | part.GetProperties(remoteClient); |
801 | } | 803 | } |
@@ -1879,9 +1881,19 @@ namespace OpenSim.Region.Framework.Scenes | |||
1879 | } | 1881 | } |
1880 | } | 1882 | } |
1881 | 1883 | ||
1882 | public void AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) | 1884 | /// <summary> |
1885 | /// Attach an object. | ||
1886 | /// </summary> | ||
1887 | /// <param name="controllingClient"></param> | ||
1888 | /// <param name="localID"></param> | ||
1889 | /// <param name="attachPoint"></param> | ||
1890 | /// <param name="rot"></param> | ||
1891 | /// <param name="pos"></param> | ||
1892 | /// <param name="silent"></param> | ||
1893 | /// <returns>true if the object was successfully attached, false otherwise</returns> | ||
1894 | public bool AttachObject(IClientAPI controllingClient, uint localID, uint attachPoint, Quaternion rot, Vector3 pos, bool silent) | ||
1883 | { | 1895 | { |
1884 | m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); | 1896 | return m_sceneGraph.AttachObject(controllingClient, localID, attachPoint, rot, pos, silent); |
1885 | } | 1897 | } |
1886 | 1898 | ||
1887 | public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) | 1899 | public void AttachObject(IClientAPI remoteClient, uint AttachmentPt, UUID itemID, SceneObjectGroup att) |