diff options
| author | Melanie | 2013-03-03 13:24:37 +0000 |
|---|---|---|
| committer | Melanie | 2013-03-03 13:24:37 +0000 |
| commit | f39e4abf0ed67e3101286651f7a5efdf7140e4e4 (patch) | |
| tree | a5e30b220b66136ec3812db84d962d54193944a8 /OpenSim/Region/ScriptEngine/Shared/Api/Implementation | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Make Keyframe motion cross regions again (diff) | |
| download | opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.zip opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.gz opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.bz2 opensim-SC-f39e4abf0ed67e3101286651f7a5efdf7140e4e4.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Api/Implementation')
| -rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index 4a7f68b..e87bb04 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
| @@ -1655,7 +1655,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
| 1655 | } | 1655 | } |
| 1656 | } | 1656 | } |
| 1657 | 1657 | ||
| 1658 | public Object osParseJSONNew(string JSON) | 1658 | private Object osParseJSONNew(string JSON) |
| 1659 | { | 1659 | { |
| 1660 | CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); | 1660 | CheckThreatLevel(ThreatLevel.None, "osParseJSONNew"); |
| 1661 | 1661 | ||