ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-31 06:45:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'avination' into careminster

Browse Source
This commit is contained in:
Melanie
2012-05-17 13:34:47 +01:00
parent 34f20b7fe3 7652b3a957
commit b4cd8b491b
6 changed files with 332 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
View File

@@ -847,6 +847,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
part.CollisionSound = UUID.Zero;
AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
EventQueue.Clear();
m_Script.ResetVars();
@@ -873,6 +874,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance
SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID);
part.Inventory.GetInventoryItem(ItemID).PermsMask = 0;
part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero;
part.CollisionSound = UUID.Zero;
AsyncCommandManager.RemoveScript(Engine, LocalID, ItemID);
EventQueue.Clear();