diff options
author | Melanie | 2011-12-12 11:09:13 +0100 |
---|---|---|
committer | Melanie | 2011-12-12 11:09:13 +0100 |
commit | 95d533ce8a18be6451fb3492f6f659bcb2bbe241 (patch) | |
tree | a914550165e016b9746a0f1911c9dc2f4ca6c28c /OpenSim/Region/ScriptEngine/Shared/Api/Interface | |
parent | Send changed animation event asynchronously (diff) | |
parent | Merge branch 'master' into careminster (diff) | |
download | opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.zip opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.gz opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.bz2 opensim-SC-95d533ce8a18be6451fb3492f6f659bcb2bbe241.tar.xz |
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Interface')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs index a61d553..221a513 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||
@@ -25,6 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.Collections; | 29 | using System.Collections; |
29 | using OpenSim.Region.ScriptEngine.Interfaces; | 30 | using OpenSim.Region.ScriptEngine.Interfaces; |
30 | 31 | ||
@@ -140,6 +141,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces | |||
140 | 141 | ||
141 | string osGetScriptEngineName(); | 142 | string osGetScriptEngineName(); |
142 | string osGetSimulatorVersion(); | 143 | string osGetSimulatorVersion(); |
144 | Object osParseJSONNew(string JSON); | ||
143 | Hashtable osParseJSON(string JSON); | 145 | Hashtable osParseJSON(string JSON); |
144 | 146 | ||
145 | void osMessageObject(key objectUUID,string message); | 147 | void osMessageObject(key objectUUID,string message); |