aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
diff options
context:
space:
mode:
authorBlueWall2015-02-27 12:27:10 -0500
committerBlueWall2015-02-27 12:27:10 -0500
commitaeb8a4bf85816595c9c2ba82413e309e7aa69062 (patch)
tree5e57ea2c030b12916885d0b84da90b5440db37e8 /OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
parentAdding dynamic ossl permission control (diff)
downloadopensim-SC_OLD-aeb8a4bf85816595c9c2ba82413e309e7aa69062.zip
opensim-SC_OLD-aeb8a4bf85816595c9c2ba82413e309e7aa69062.tar.gz
opensim-SC_OLD-aeb8a4bf85816595c9c2ba82413e309e7aa69062.tar.bz2
opensim-SC_OLD-aeb8a4bf85816595c9c2ba82413e309e7aa69062.tar.xz
Revert "Adding dynamic ossl permission control"
This reverts commit a3681f3052fb5e98e31e7051329a5b748a8bdd8d until further testing. Jenkins now fails ossl tests.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs4
1 files changed, 0 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
index 2cbaf5a..38d4574 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
@@ -116,10 +116,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api.Interfaces
116 { 116 {
117 void CheckThreatLevel(ThreatLevel level, string function); 117 void CheckThreatLevel(ThreatLevel level, string function);
118 118
119 // Scripted Script Permissions
120 void osGrantScriptPermissions(LSL_Key avatar, LSL_List functions);
121 void osRevokeScriptPermissions(LSL_Key avatar, LSL_List functions);
122
123 //OpenSim functions 119 //OpenSim functions
124 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer); 120 string osSetDynamicTextureURL(string dynamicID, string contentType, string url, string extraParams, int timer);
125 string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams, 121 string osSetDynamicTextureURLBlend(string dynamicID, string contentType, string url, string extraParams,