aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-14 18:43:40 +0000
committerJustin Clarke Casey2008-11-14 18:43:40 +0000
commite3770cfee6e3ae0ad05b5be2f96f10779b39c454 (patch)
treee748ceb78fec5d15297cfaf9d2b75b0f959e3781 /OpenSim/Region/ScriptEngine
parentTry to make the test pass again (diff)
downloadopensim-SC_OLD-e3770cfee6e3ae0ad05b5be2f96f10779b39c454.zip
opensim-SC_OLD-e3770cfee6e3ae0ad05b5be2f96f10779b39c454.tar.gz
opensim-SC_OLD-e3770cfee6e3ae0ad05b5be2f96f10779b39c454.tar.bz2
opensim-SC_OLD-e3770cfee6e3ae0ad05b5be2f96f10779b39c454.tar.xz
* Allow new script creation to be locked down to only gods if specified in OpenSim.ini
* This doesn't allow complete script lockdown of a sim, many avenues (copying, editing) are still uncloseable at the moment * Default remains to allow all users to create scripts (subject to existing permissions if enabled)
Diffstat (limited to 'OpenSim/Region/ScriptEngine')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs5
1 files changed, 1 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
index 8cac070..72a8dc5 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
@@ -736,7 +736,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
736 return m_ScriptEngine.World.GetSimulatorVersion(); 736 return m_ScriptEngine.World.GetSimulatorVersion();
737 } 737 }
738 738
739
740 //for testing purposes only 739 //for testing purposes only
741 public void osSetParcelMediaTime(double time) 740 public void osSetParcelMediaTime(double time)
742 { 741 {
@@ -750,9 +749,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
750 749
751 World.ParcelMediaSetTime((float)time); 750 World.ParcelMediaSetTime((float)time);
752 } 751 }
753 752
754
755
756 public Hashtable osParseJSON(string JSON) 753 public Hashtable osParseJSON(string JSON)
757 { 754 {
758 CheckThreatLevel(ThreatLevel.None, "osParseJSON"); 755 CheckThreatLevel(ThreatLevel.None, "osParseJSON");