diff options
| author | Melanie | 2012-12-18 09:45:40 +0000 |
|---|---|---|
| committer | Melanie | 2012-12-18 09:45:40 +0000 |
| commit | caea7601cb64be6c872dd44b61df10fb2e5f4e96 (patch) | |
| tree | 9cba3186c574d3ecbef73646e0efc3ab3b68f90c /OpenSim/Region/ScriptEngine/Shared | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.zip opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.gz opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.bz2 opensim-SC-caea7601cb64be6c872dd44b61df10fb2e5f4e96.tar.xz | |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs index 68f701c..ff4d130 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs | |||
| @@ -880,7 +880,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 880 | return (DateTime.Now - m_EventStart).Seconds; | 880 | return (DateTime.Now - m_EventStart).Seconds; |
| 881 | } | 881 | } |
| 882 | 882 | ||
| 883 | public void ResetScript() | 883 | public void ResetScript(int timeout) |
| 884 | { | 884 | { |
| 885 | if (m_Script == null) | 885 | if (m_Script == null) |
| 886 | return; | 886 | return; |
| @@ -890,7 +890,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Instance | |||
| 890 | RemoveState(); | 890 | RemoveState(); |
| 891 | ReleaseControls(); | 891 | ReleaseControls(); |
| 892 | 892 | ||
| 893 | Stop(0); | 893 | Stop(timeout); |
| 894 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); | 894 | SceneObjectPart part = Engine.World.GetSceneObjectPart(LocalID); |
| 895 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; | 895 | part.Inventory.GetInventoryItem(ItemID).PermsMask = 0; |
| 896 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; | 896 | part.Inventory.GetInventoryItem(ItemID).PermsGranter = UUID.Zero; |