diff options
| author | Melanie | 2012-06-26 17:35:55 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-26 17:35:55 +0100 |
| commit | 7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9 (patch) | |
| tree | 5492a786c85a7edd63fb8ad0c3c6f1da8d700741 /OpenSim/Region/Framework/Interfaces/IScriptModule.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | When attachments are being saved and deleted for a closing root agent, delete... (diff) | |
| download | opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.zip opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.gz opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.bz2 opensim-SC-7cc5b3d7d3350cbf47dab40f0c14627ef77ea4c9.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IScriptModule.cs')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IScriptModule.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs index 143af48..42dbedc 100644 --- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs | |||
| @@ -77,6 +77,8 @@ namespace OpenSim.Region.Framework.Interfaces | |||
| 77 | /// <param name="itemID">The item ID of the script.</param> | 77 | /// <param name="itemID">The item ID of the script.</param> |
| 78 | bool GetScriptState(UUID itemID); | 78 | bool GetScriptState(UUID itemID); |
| 79 | 79 | ||
| 80 | void SetRunEnable(UUID instanceID, bool enable); | ||
| 81 | |||
| 80 | void SaveAllState(); | 82 | void SaveAllState(); |
| 81 | 83 | ||
| 82 | /// <summary> | 84 | /// <summary> |