diff options
| author | Melanie | 2012-05-17 13:34:47 +0100 |
|---|---|---|
| committer | Melanie | 2012-05-17 13:34:47 +0100 |
| commit | b4cd8b491bc53baa57da3b9efb5ab8b8287ddfe1 (patch) | |
| tree | b764f0c0a7b7b6f6caeb4b3eddf1441d4f79ed17 /OpenSim/Region/ScriptEngine/Shared/Instance | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | udp transfer: make number packets estimation coerent with number actually sen... (diff) | |
| download | opensim-SC-b4cd8b491bc53baa57da3b9efb5ab8b8287ddfe1.zip opensim-SC-b4cd8b491bc53baa57da3b9efb5ab8b8287ddfe1.tar.gz opensim-SC-b4cd8b491bc53baa57da3b9efb5ab8b8287ddfe1.tar.bz2 opensim-SC-b4cd8b491bc53baa57da3b9efb5ab8b8287ddfe1.tar.xz | |
Merge branch 'avination' into careminster
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 5cad883..1c59d45 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -847,6 +847,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 847 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); | 847 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); |
| 848 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; | 848 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; |
| 849 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 849 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |
| 850 | part.CollisionSound = UUID.Zero; | ||
| 850 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 851 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
| 851 | EventQueue.Clear(); | 852 | EventQueue.Clear(); |
| 852 | m_Script.ResetVars(); | 853 | m_Script.ResetVars(); |
| @@ -873,6 +874,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 873 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); | 874 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); |
| 874 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; | 875 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; |
| 875 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 876 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |
| 877 | part.CollisionSound = UUID.Zero; | ||
| 876 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); | 878 | AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID); |
| 877 | 879 | ||
| 878 | EventQueue.Clear(); | 880 | EventQueue.Clear(); |