ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-31 05:45:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Patch #9147

Browse Source 
Patch #4 of the region settings series. Partial functionality of the new
storage system. More patches to follow.
This commit is contained in:
Melanie Thielker
2008-07-14 01:27:47 +00:00
parent 476e08286e
commit e712678689
15 changed files with 163 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
OpenSim/Region/ScriptEngine/Common/LSL_BuiltIn_Commands.cs
View File

@@ -2822,7 +2822,7 @@ namespace OpenSim.Region.ScriptEngine.Common
public double llWater(LSL_Types.Vector3 offset)
{
m_host.AddScriptLPS(1);
return World.RegionInfo.EstateSettings.waterHeight;
return World.RegionInfo.RegionSettings.WaterHeight;
}
public void llPassTouches(int pass)
@@ -6456,10 +6456,10 @@ namespace OpenSim.Region.ScriptEngine.Common
case 7: // DATA_SIM_RATING
if (info == null)
return LLUUID.Zero.ToString();
int access = (int)info.EstateSettings.simAccess;
if (access == 21)
reply = "MATURE";
else if (access == 13)
int access = info.RegionSettings.Maturity;
if (access == 0)
reply = "PG";
else if (access == 1)
reply = "MATURE";
else
reply = "UNKNOWN";
@@ -6829,7 +6829,10 @@ namespace OpenSim.Region.ScriptEngine.Common
public LSL_Types.LSLInteger llGetRegionFlags()
{
m_host.AddScriptLPS(1);
return (int)World.RegionInfo.EstateSettings.regionFlags;
IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
if(estate == null)
return 67108864;
return estate.GetRegionFlags();
}
public string llXorBase64StringsCorrect(string str1, string str2)
@@ -7006,7 +7009,7 @@ namespace OpenSim.Region.ScriptEngine.Common
// Which probably will be irrelevent in OpenSim....
LandData land = World.GetLandData((float)pos.x, (float)pos.y);
float bonusfactor = World.RegionInfo.EstateSettings.objectBonusFactor;
float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus;
if (land == null)
{

17
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@@ -2686,7 +2686,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public double llWater(LSL_Types.Vector3 offset)
{
m_host.AddScriptLPS(1);
return World.RegionInfo.EstateSettings.waterHeight;
return World.RegionInfo.RegionSettings.WaterHeight;
}
public void llPassTouches(int pass)
@@ -6235,10 +6235,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
case 7: // DATA_SIM_RATING
if (info == null)
return LLUUID.Zero.ToString();
int access = (int)info.EstateSettings.simAccess;
if (access == 21)
reply = "MATURE";
else if (access == 13)
int access = info.RegionSettings.Maturity;
if (access == 0)
reply = "PG";
else if (access == 1)
reply = "MATURE";
else
reply = "UNKNOWN";
@@ -6609,7 +6609,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
public LSL_Types.LSLInteger llGetRegionFlags()
{
m_host.AddScriptLPS(1);
return (int)World.RegionInfo.EstateSettings.regionFlags;
IEstateModule estate = World.RequestModuleInterface<IEstateModule>();
if(estate == null)
return 67108864;
return (int)estate.GetRegionFlags();
}
public string llXorBase64StringsCorrect(string str1, string str2)
@@ -6786,7 +6789,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// Which probably will be irrelevent in OpenSim....
LandData land = World.GetLandData((float)pos.x, (float)pos.y);
float bonusfactor = World.RegionInfo.EstateSettings.objectBonusFactor;
float bonusfactor = (float)World.RegionInfo.RegionSettings.ObjectBonus;
if (land == null)
{