diff options
author | Melanie | 2010-11-21 23:47:28 +0000 |
---|---|---|
committer | Melanie | 2010-11-21 23:47:28 +0000 |
commit | 8d7b181b58d89b109b522d1b1401ea72cf16e694 (patch) | |
tree | 69d7ae271383933e82be070d652dc7979f54a09b /OpenSim/Region/ScriptEngine/Shared | |
parent | Add the remote connector for freeswitch config retrieval (diff) | |
parent | Add the remote connector for freeswitch config retrieval (diff) | |
download | opensim-SC-8d7b181b58d89b109b522d1b1401ea72cf16e694.zip opensim-SC-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.gz opensim-SC-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.bz2 opensim-SC-8d7b181b58d89b109b522d1b1401ea72cf16e694.tar.xz |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 6d8e558..dee0d9a 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -9283,7 +9283,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9283 | 9283 | ||
9284 | switch (data) | 9284 | switch (data) |
9285 | { | 9285 | { |
9286 | case 5: // DATA_SIM_POS | 9286 | case ScriptBaseClass.DATA_SIM_POS: |
9287 | if (info == null) | 9287 | if (info == null) |
9288 | { | 9288 | { |
9289 | ScriptSleep(1000); | 9289 | ScriptSleep(1000); |
@@ -9294,13 +9294,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9294 | info.RegionLocY, | 9294 | info.RegionLocY, |
9295 | 0).ToString(); | 9295 | 0).ToString(); |
9296 | break; | 9296 | break; |
9297 | case 6: // DATA_SIM_STATUS | 9297 | case ScriptBaseClass.DATA_SIM_STATUS: |
9298 | if (info != null) | 9298 | if (info != null) |
9299 | reply = "up"; // Duh! | 9299 | reply = "up"; // Duh! |
9300 | else | 9300 | else |
9301 | reply = "unknown"; | 9301 | reply = "unknown"; |
9302 | break; | 9302 | break; |
9303 | case 7: // DATA_SIM_RATING | 9303 | case ScriptBaseClass.DATA_SIM_RATING: |
9304 | if (info == null) | 9304 | if (info == null) |
9305 | { | 9305 | { |
9306 | ScriptSleep(1000); | 9306 | ScriptSleep(1000); |
@@ -9316,7 +9316,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
9316 | else | 9316 | else |
9317 | reply = "UNKNOWN"; | 9317 | reply = "UNKNOWN"; |
9318 | break; | 9318 | break; |
9319 | case 128: | 9319 | case ScriptBaseClass.DATA_SIM_RELEASE: |
9320 | if (ossl != null) | 9320 | if (ossl != null) |
9321 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); | 9321 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); |
9322 | reply = "OpenSim"; | 9322 | reply = "OpenSim"; |