diff options
author | Melanie Thielker | 2008-07-14 01:27:47 +0000 |
---|---|---|
committer | Melanie Thielker | 2008-07-14 01:27:47 +0000 |
commit | e712678689f37f7a58e02547a5dbe6a214680db2 (patch) | |
tree | a7f13c72ca14860cfb2099fe0603878e57120d7d /OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |
parent | Mantis#1728. Thank you kindly, Mikem for a patch that solves: (diff) | |
download | opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.zip opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.gz opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.bz2 opensim-SC_OLD-e712678689f37f7a58e02547a5dbe6a214680db2.tar.xz |
Patch #9147
Patch #4 of the region settings series. Partial functionality of the new
storage system. More patches to follow.
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs index 8edd169..30a64c7 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||
@@ -2686,7 +2686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
2686 | public double llWater(LSL_Types.Vector3 offset) | 2686 | public double llWater(LSL_Types.Vector3 offset) |
2687 | { | 2687 | { |
2688 | m_host.AddScriptLPS(1); | 2688 | m_host.AddScriptLPS(1); |
2689 | return World.RegionInfo.EstateSettings.waterHeight; | 2689 | return World.RegionInfo.RegionSettings.WaterHeight; |
2690 | } | 2690 | } |
2691 | 2691 | ||
2692 | public void llPassTouches(int pass) | 2692 | public void llPassTouches(int pass) |
@@ -6235,10 +6235,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6235 | case 7: // DATA_SIM_RATING | 6235 | case 7: // DATA_SIM_RATING |
6236 | if (info == null) | 6236 | if (info == null) |
6237 | return LLUUID.Zero.ToString(); | 6237 | return LLUUID.Zero.ToString(); |
6238 | int access = (int)info.EstateSettings.simAccess; | 6238 | int access = info.RegionSettings.Maturity; |
6239 | if (access == 21) | 6239 | if (access == 0) |
6240 | reply = "MATURE"; | 6240 | reply = "PG"; |
6241 | else if (access == 13) | 6241 | else if (access == 1) |
6242 | reply = "MATURE"; | 6242 | reply = "MATURE"; |
6243 | else | 6243 | else |
6244 | reply = "UNKNOWN"; | 6244 | reply = "UNKNOWN"; |
@@ -6609,7 +6609,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6609 | public LSL_Types.LSLInteger llGetRegionFlags() | 6609 | public LSL_Types.LSLInteger llGetRegionFlags() |
6610 | { | 6610 | { |
6611 | m_host.AddScriptLPS(1); | 6611 | m_host.AddScriptLPS(1); |
6612 | return (int)World.RegionInfo.EstateSettings.regionFlags; | 6612 | IEstateModule estate = World.RequestModuleInterface<IEstateModule>(); |
6613 | if(estate == null) | ||
6614 | return 67108864; | ||
6615 | return (int)estate.GetRegionFlags(); | ||
6613 | } | 6616 | } |
6614 | 6617 | ||
6615 | public string llXorBase64StringsCorrect(string str1, string str2) | 6618 | public string llXorBase64StringsCorrect(string str1, string str2) |
@@ -6786,7 +6789,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api | |||
6786 | // Which probably will be irrelevent in OpenSim.... | 6789 | // Which probably will be irrelevent in OpenSim.... |
6787 | LandData land = World.GetLandData((float)pos.x, (float)pos.y); | 6790 | LandData land = World.GetLandData((float)pos.x, (float)pos.y); |
6788 | 6791 | ||
6789 | float bonusfactor = World.RegionInfo.EstateSettings.objectBonusFactor; | 6792 | float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus; |
6790 | 6793 | ||
6791 | if (land == null) | 6794 | if (land == null) |
6792 | { | 6795 | { |