diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 7 | ||||
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | 14 |
2 files changed, 8 insertions, 13 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 4ae4fe2..783b1e4 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -7182,6 +7182,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7182 | 7182 | ||
7183 | public LSL_String llRequestSimulatorData(string simulator, int data) | 7183 | public LSL_String llRequestSimulatorData(string simulator, int data) |
7184 | { | 7184 | { |
7185 | IOSSL_Api ossl = (IOSSL_Api)m_ScriptEngine.GetApi(m_itemID, "OSSL"); | ||
7186 | |||
7185 | try | 7187 | try |
7186 | { | 7188 | { |
7187 | m_host.AddScriptLPS(1); | 7189 | m_host.AddScriptLPS(1); |
@@ -7223,6 +7225,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
7223 | else | 7225 | else |
7224 | reply = "UNKNOWN"; | 7226 | reply = "UNKNOWN"; |
7225 | break; | 7227 | break; |
7228 | case 128: | ||
7229 | if (ossl != null) | ||
7230 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); | ||
7231 | reply = "OpenSim"; | ||
7232 | break; | ||
7226 | default: | 7233 | default: |
7227 | // ScriptSleep(1000); | 7234 | // ScriptSleep(1000); |
7228 | return UUID.Zero.ToString(); // Raise no event | 7235 | return UUID.Zero.ToString(); // Raise no event |
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs index c5e6359..bfe289c 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs | |||
@@ -87,18 +87,6 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
87 | // modification of user data, or allows the compromise of | 87 | // modification of user data, or allows the compromise of |
88 | // sensitive data by design. | 88 | // sensitive data by design. |
89 | 89 | ||
90 | public enum ThreatLevel | ||
91 | { | ||
92 | None = 0, | ||
93 | Nuisance = 1, | ||
94 | VeryLow = 2, | ||
95 | Low = 3, | ||
96 | Moderate = 4, | ||
97 | High = 5, | ||
98 | VeryHigh = 6, | ||
99 | Severe = 7 | ||
100 | }; | ||
101 | |||
102 | [Serializable] | 90 | [Serializable] |
103 | public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi | 91 | public class OSSL_Api : MarshalByRefObject, IOSSL_Api, IScriptApi |
104 | { | 92 | { |
@@ -180,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
180 | throw new Exception("OSSL Runtime Error: " + msg); | 168 | throw new Exception("OSSL Runtime Error: " + msg); |
181 | } | 169 | } |
182 | 170 | ||
183 | protected void CheckThreatLevel(ThreatLevel level, string function) | 171 | public void CheckThreatLevel(ThreatLevel level, string function) |
184 | { | 172 | { |
185 | if (!m_OSFunctionsEnabled) | 173 | if (!m_OSFunctionsEnabled) |
186 | OSSLError(function+": permission denied"); // throws | 174 | OSSLError(function+": permission denied"); // throws |