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/Common/LSL_BuiltIn_Commands.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/Common/LSL_BuiltIn_Commands.cs | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs index 4fc4608..0d3049d 100644 --- a/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs +++ b/OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs | |||
@@ -2822,7 +2822,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
2822 | public double llWater(LSL_Types.Vector3 offset) | 2822 | public double llWater(LSL_Types.Vector3 offset) |
2823 | { | 2823 | { |
2824 | m_host.AddScriptLPS(1); | 2824 | m_host.AddScriptLPS(1); |
2825 | return World.RegionInfo.EstateSettings.waterHeight; | 2825 | return World.RegionInfo.RegionSettings.WaterHeight; |
2826 | } | 2826 | } |
2827 | 2827 | ||
2828 | public void llPassTouches(int pass) | 2828 | public void llPassTouches(int pass) |
@@ -6456,10 +6456,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
6456 | case 7: // DATA_SIM_RATING | 6456 | case 7: // DATA_SIM_RATING |
6457 | if (info == null) | 6457 | if (info == null) |
6458 | return LLUUID.Zero.ToString(); | 6458 | return LLUUID.Zero.ToString(); |
6459 | int access = (int)info.EstateSettings.simAccess; | 6459 | int access = info.RegionSettings.Maturity; |
6460 | if (access == 21) | 6460 | if (access == 0) |
6461 | reply = "MATURE"; | 6461 | reply = "PG"; |
6462 | else if (access == 13) | 6462 | else if (access == 1) |
6463 | reply = "MATURE"; | 6463 | reply = "MATURE"; |
6464 | else | 6464 | else |
6465 | reply = "UNKNOWN"; | 6465 | reply = "UNKNOWN"; |
@@ -6829,7 +6829,10 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
6829 | public LSL_Types.LSLInteger llGetRegionFlags() | 6829 | public LSL_Types.LSLInteger llGetRegionFlags() |
6830 | { | 6830 | { |
6831 | m_host.AddScriptLPS(1); | 6831 | m_host.AddScriptLPS(1); |
6832 | return (int)World.RegionInfo.EstateSettings.regionFlags; | 6832 | IEstateModule estate = World.RequestModuleInterface<IEstateModule>(); |
6833 | if(estate == null) | ||
6834 | return 67108864; | ||
6835 | return estate.GetRegionFlags(); | ||
6833 | } | 6836 | } |
6834 | 6837 | ||
6835 | public string llXorBase64StringsCorrect(string str1, string str2) | 6838 | public string llXorBase64StringsCorrect(string str1, string str2) |
@@ -7006,7 +7009,7 @@ namespace OpenSim.Region.ScriptEngine.Common | |||
7006 | // Which probably will be irrelevent in OpenSim.... | 7009 | // Which probably will be irrelevent in OpenSim.... |
7007 | LandData land = World.GetLandData((float)pos.x, (float)pos.y); | 7010 | LandData land = World.GetLandData((float)pos.x, (float)pos.y); |
7008 | 7011 | ||
7009 | float bonusfactor = World.RegionInfo.EstateSettings.objectBonusFactor; | 7012 | float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus; |
7010 | 7013 | ||
7011 | if (land == null) | 7014 | if (land == null) |
7012 | { | 7015 | { |