diff options
author | Marck | 2010-11-16 13:46:26 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-11-20 03:03:11 +0000 |
commit | f1151f20dcf3786248bdd1b5d5bb119f79881be0 (patch) | |
tree | 1fcfbe47c3a85c0f79e24399a3700b9485be8544 /OpenSim | |
parent | Knock V0_2 decals off archive tests since they're misleading (diff) | |
download | opensim-SC_OLD-f1151f20dcf3786248bdd1b5d5bb119f79881be0.zip opensim-SC_OLD-f1151f20dcf3786248bdd1b5d5bb119f79881be0.tar.gz opensim-SC_OLD-f1151f20dcf3786248bdd1b5d5bb119f79881be0.tar.bz2 opensim-SC_OLD-f1151f20dcf3786248bdd1b5d5bb119f79881be0.tar.xz |
Fix global region coordinates that are delivered by llRequestSimulatorData.
Also did some source code clean-up by replacing literals with constants.
Diffstat (limited to 'OpenSim')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index cc3cf17..d06b134 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -8750,24 +8750,24 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8750 | 8750 | ||
8751 | switch (data) | 8751 | switch (data) |
8752 | { | 8752 | { |
8753 | case 5: // DATA_SIM_POS | 8753 | case ScriptBaseClass.DATA_SIM_POS: |
8754 | if (info == null) | 8754 | if (info == null) |
8755 | { | 8755 | { |
8756 | ScriptSleep(1000); | 8756 | ScriptSleep(1000); |
8757 | return UUID.Zero.ToString(); | 8757 | return UUID.Zero.ToString(); |
8758 | } | 8758 | } |
8759 | reply = new LSL_Vector( | 8759 | reply = new LSL_Vector( |
8760 | info.RegionLocX * Constants.RegionSize, | 8760 | info.RegionLocX, |
8761 | info.RegionLocY * Constants.RegionSize, | 8761 | info.RegionLocY, |
8762 | 0).ToString(); | 8762 | 0).ToString(); |
8763 | break; | 8763 | break; |
8764 | case 6: // DATA_SIM_STATUS | 8764 | case ScriptBaseClass.DATA_SIM_STATUS: |
8765 | if (info != null) | 8765 | if (info != null) |
8766 | reply = "up"; // Duh! | 8766 | reply = "up"; // Duh! |
8767 | else | 8767 | else |
8768 | reply = "unknown"; | 8768 | reply = "unknown"; |
8769 | break; | 8769 | break; |
8770 | case 7: // DATA_SIM_RATING | 8770 | case ScriptBaseClass.DATA_SIM_RATING: |
8771 | if (info == null) | 8771 | if (info == null) |
8772 | { | 8772 | { |
8773 | ScriptSleep(1000); | 8773 | ScriptSleep(1000); |
@@ -8783,7 +8783,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
8783 | else | 8783 | else |
8784 | reply = "UNKNOWN"; | 8784 | reply = "UNKNOWN"; |
8785 | break; | 8785 | break; |
8786 | case 128: | 8786 | case ScriptBaseClass.DATA_SIM_RELEASE: |
8787 | if (ossl != null) | 8787 | if (ossl != null) |
8788 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); | 8788 | ossl.CheckThreatLevel(ThreatLevel.High, "llRequestSimulatorData"); |
8789 | reply = "OpenSim"; | 8789 | reply = "OpenSim"; |