diff options
author | Justin Clark-Casey (justincc) | 2013-01-16 01:45:09 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2013-01-16 01:45:09 +0000 |
commit | b8949024bc55c62b9268b35d4f2a568760b9d7d3 (patch) | |
tree | 7b8d984c957fab7aba5aceec66967adb5e8a0d51 /OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.zip opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.gz opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.bz2 opensim-SC_OLD-b8949024bc55c62b9268b35d4f2a568760b9d7d3.tar.xz |
Revert "Implement co-operative script termination if termination comes during a script wait event (llSleep(), etc.)"
Doing this as a favour to Melanie. This will be back with passing the wait handles directly to the api.
This reverts commit 1b5c41c14ad11325be249ea1cce3c65d4d6a89be.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs index 92bf85a..5c8b097 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | |||
@@ -1738,21 +1738,6 @@ namespace OpenSim.Region.Framework.Scenes | |||
1738 | /// <returns>The part where the script was rezzed if successful. False otherwise.</returns> | 1738 | /// <returns>The part where the script was rezzed if successful. False otherwise.</returns> |
1739 | public SceneObjectPart RezNewScript(UUID agentID, InventoryItemBase itemBase) | 1739 | public SceneObjectPart RezNewScript(UUID agentID, InventoryItemBase itemBase) |
1740 | { | 1740 | { |
1741 | return RezNewScript( | ||
1742 | agentID, | ||
1743 | itemBase, | ||
1744 | "default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"); | ||
1745 | } | ||
1746 | |||
1747 | /// <summary> | ||
1748 | /// Rez a new script from nothing with given script text. | ||
1749 | /// </summary> | ||
1750 | /// <param name="remoteClient"></param> | ||
1751 | /// <param name="itemBase">Template item.</param> | ||
1752 | /// <param name="scriptText"></param> | ||
1753 | /// <returns>The part where the script was rezzed if successful. False otherwise.</returns> | ||
1754 | public SceneObjectPart RezNewScript(UUID agentID, InventoryItemBase itemBase, string scriptText) | ||
1755 | { | ||
1756 | // The part ID is the folder ID! | 1741 | // The part ID is the folder ID! |
1757 | SceneObjectPart part = GetSceneObjectPart(itemBase.Folder); | 1742 | SceneObjectPart part = GetSceneObjectPart(itemBase.Folder); |
1758 | if (part == null) | 1743 | if (part == null) |
@@ -1772,14 +1757,9 @@ namespace OpenSim.Region.Framework.Scenes | |||
1772 | return null; | 1757 | return null; |
1773 | } | 1758 | } |
1774 | 1759 | ||
1775 | AssetBase asset | 1760 | AssetBase asset = CreateAsset(itemBase.Name, itemBase.Description, (sbyte)itemBase.AssetType, |
1776 | = CreateAsset( | 1761 | Encoding.ASCII.GetBytes("default\n{\n state_entry()\n {\n llSay(0, \"Script running\");\n }\n}"), |
1777 | itemBase.Name, | 1762 | agentID); |
1778 | itemBase.Description, | ||
1779 | (sbyte)itemBase.AssetType, | ||
1780 | Encoding.ASCII.GetBytes(scriptText), | ||
1781 | agentID); | ||
1782 | |||
1783 | AssetService.Store(asset); | 1763 | AssetService.Store(asset); |
1784 | 1764 | ||
1785 | TaskInventoryItem taskItem = new TaskInventoryItem(); | 1765 | TaskInventoryItem taskItem = new TaskInventoryItem(); |