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

* Made EstateSetting static since there's only one instance, and we only need to create it once

Browse Source 
* Now cacheing RegionInfos indefinitively; we should add a tiomeout to this cache
This commit is contained in:
lbsa71
2007-10-22 17:55:49 +00:00
parent 81e5cf14ce
commit dd770c384c
7 changed files with 141 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
OpenSim/Region/Environment/EstateManager.cs
View File

@@ -73,20 +73,20 @@ namespace OpenSim.Region.Environment
switch (corner)
{
case 0:
m_regInfo.estateSettings.terrainStartHeight0 = lowValue;
m_regInfo.estateSettings.terrainHeightRange0 = highValue;
m_regInfo.EstateSettings.terrainStartHeight0 = lowValue;
m_regInfo.EstateSettings.terrainHeightRange0 = highValue;
break;
case 1:
m_regInfo.estateSettings.terrainStartHeight1 = lowValue;
m_regInfo.estateSettings.terrainHeightRange1 = highValue;
m_regInfo.EstateSettings.terrainStartHeight1 = lowValue;
m_regInfo.EstateSettings.terrainHeightRange1 = highValue;
break;
case 2:
m_regInfo.estateSettings.terrainStartHeight2 = lowValue;
m_regInfo.estateSettings.terrainHeightRange2 = highValue;
m_regInfo.EstateSettings.terrainStartHeight2 = lowValue;
m_regInfo.EstateSettings.terrainHeightRange2 = highValue;
break;
case 3:
m_regInfo.estateSettings.terrainStartHeight3 = lowValue;
m_regInfo.estateSettings.terrainHeightRange3 = highValue;
m_regInfo.EstateSettings.terrainStartHeight3 = lowValue;
m_regInfo.EstateSettings.terrainHeightRange3 = highValue;
break;
}
}
@@ -101,16 +101,16 @@ namespace OpenSim.Region.Environment
switch (band)
{
case 0:
m_regInfo.estateSettings.terrainDetail0 = textureUUID;
m_regInfo.EstateSettings.terrainDetail0 = textureUUID;
break;
case 1:
m_regInfo.estateSettings.terrainDetail1 = textureUUID;
m_regInfo.EstateSettings.terrainDetail1 = textureUUID;
break;
case 2:
m_regInfo.estateSettings.terrainDetail2 = textureUUID;
m_regInfo.EstateSettings.terrainDetail2 = textureUUID;
break;
case 3:
m_regInfo.estateSettings.terrainDetail3 = textureUUID;
m_regInfo.EstateSettings.terrainDetail3 = textureUUID;
break;
}
}
@@ -127,18 +127,18 @@ namespace OpenSim.Region.Environment
bool UseFixedSun, float SunHour)
{
// Water Height
m_regInfo.estateSettings.waterHeight = WaterHeight;
m_regInfo.EstateSettings.waterHeight = WaterHeight;
m_scene.Terrain.watermap.Fill(WaterHeight);
// Terraforming limits
m_regInfo.estateSettings.terrainRaiseLimit = TerrainRaiseLimit;
m_regInfo.estateSettings.terrainLowerLimit = TerrainLowerLimit;
m_regInfo.EstateSettings.terrainRaiseLimit = TerrainRaiseLimit;
m_regInfo.EstateSettings.terrainLowerLimit = TerrainLowerLimit;
m_scene.Terrain.maxRaise = TerrainRaiseLimit;
m_scene.Terrain.minLower = TerrainLowerLimit;
// Time of day / fixed sun
m_regInfo.estateSettings.useFixedSun = UseFixedSun;
m_regInfo.estateSettings.sunHour = SunHour;
m_regInfo.EstateSettings.useFixedSun = UseFixedSun;
m_regInfo.EstateSettings.sunHour = SunHour;
}
#region Packet Handlers
@@ -187,54 +187,54 @@ namespace OpenSim.Region.Environment
}
else
{
m_regInfo.estateSettings.regionFlags = Simulator.RegionFlags.None;
m_regInfo.EstateSettings.regionFlags = Simulator.RegionFlags.None;
if (convertParamStringToBool(packet.ParamList[0].Parameter))
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.BlockTerraform;
}
if (convertParamStringToBool(packet.ParamList[1].Parameter))
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.NoFly;
}
if (convertParamStringToBool(packet.ParamList[2].Parameter))
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.AllowDamage;
}
if (convertParamStringToBool(packet.ParamList[3].Parameter) == false)
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.BlockLandResell;
}
int tempMaxAgents =
Convert.ToInt16(Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[4].Parameter)));
m_regInfo.estateSettings.maxAgents = (byte)tempMaxAgents;
m_regInfo.EstateSettings.maxAgents = (byte)tempMaxAgents;
float tempObjectBonusFactor =
(float)Convert.ToDecimal(Helpers.FieldToUTF8String(packet.ParamList[5].Parameter));
m_regInfo.estateSettings.objectBonusFactor = tempObjectBonusFactor;
m_regInfo.EstateSettings.objectBonusFactor = tempObjectBonusFactor;
int tempMatureLevel = Convert.ToInt16(Helpers.FieldToUTF8String(packet.ParamList[6].Parameter));
m_regInfo.estateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;
m_regInfo.EstateSettings.simAccess = (Simulator.SimAccess)tempMatureLevel;
if (convertParamStringToBool(packet.ParamList[7].Parameter))
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.RestrictPushObject;
}
if (convertParamStringToBool(packet.ParamList[8].Parameter))
{
m_regInfo.estateSettings.regionFlags = m_regInfo.estateSettings.regionFlags |
m_regInfo.EstateSettings.regionFlags = m_regInfo.EstateSettings.regionFlags |
Simulator.RegionFlags.AllowParcelChanges;
}
@@ -309,16 +309,16 @@ namespace OpenSim.Region.Environment
switch (Convert.ToInt16(splitField[0]))
{
case 0:
m_regInfo.estateSettings.terrainBase0 = tempUUID;
m_regInfo.EstateSettings.terrainBase0 = tempUUID;
break;
case 1:
m_regInfo.estateSettings.terrainBase1 = tempUUID;
m_regInfo.EstateSettings.terrainBase1 = tempUUID;
break;
case 2:
m_regInfo.estateSettings.terrainBase2 = tempUUID;
m_regInfo.EstateSettings.terrainBase2 = tempUUID;
break;
case 3:
m_regInfo.estateSettings.terrainBase3 = tempUUID;
m_regInfo.EstateSettings.terrainBase3 = tempUUID;
break;
}
}
@@ -355,22 +355,22 @@ namespace OpenSim.Region.Environment
RegionInfoPacket regionInfoPacket = new RegionInfoPacket();
regionInfoPacket.AgentData.AgentID = circuitData.AgentID;
regionInfoPacket.AgentData.SessionID = circuitData.SessionID;
regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.estateSettings.billableFactor;
regionInfoPacket.RegionInfo.EstateID = m_regInfo.estateSettings.estateID;
regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.estateSettings.maxAgents;
regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.estateSettings.objectBonusFactor;
regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.estateSettings.parentEstateID;
regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.estateSettings.pricePerMeter;
regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.estateSettings.redirectGridX;
regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.estateSettings.redirectGridY;
regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.estateSettings.regionFlags;
regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.estateSettings.simAccess;
regionInfoPacket.RegionInfo.BillableFactor = m_regInfo.EstateSettings.billableFactor;
regionInfoPacket.RegionInfo.EstateID = m_regInfo.EstateSettings.estateID;
regionInfoPacket.RegionInfo.MaxAgents = m_regInfo.EstateSettings.maxAgents;
regionInfoPacket.RegionInfo.ObjectBonusFactor = m_regInfo.EstateSettings.objectBonusFactor;
regionInfoPacket.RegionInfo.ParentEstateID = m_regInfo.EstateSettings.parentEstateID;
regionInfoPacket.RegionInfo.PricePerMeter = m_regInfo.EstateSettings.pricePerMeter;
regionInfoPacket.RegionInfo.RedirectGridX = m_regInfo.EstateSettings.redirectGridX;
regionInfoPacket.RegionInfo.RedirectGridY = m_regInfo.EstateSettings.redirectGridY;
regionInfoPacket.RegionInfo.RegionFlags = (uint)m_regInfo.EstateSettings.regionFlags;
regionInfoPacket.RegionInfo.SimAccess = (byte)m_regInfo.EstateSettings.simAccess;
regionInfoPacket.RegionInfo.SimName = _enc.GetBytes(m_regInfo.RegionName);
regionInfoPacket.RegionInfo.SunHour = m_regInfo.estateSettings.sunHour;
regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.estateSettings.terrainLowerLimit;
regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.estateSettings.terrainRaiseLimit;
regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.estateSettings.useFixedSun;
regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.estateSettings.waterHeight;
regionInfoPacket.RegionInfo.SunHour = m_regInfo.EstateSettings.sunHour;
regionInfoPacket.RegionInfo.TerrainLowerLimit = m_regInfo.EstateSettings.terrainLowerLimit;
regionInfoPacket.RegionInfo.TerrainRaiseLimit = m_regInfo.EstateSettings.terrainRaiseLimit;
regionInfoPacket.RegionInfo.UseEstateSun = !m_regInfo.EstateSettings.useFixedSun;
regionInfoPacket.RegionInfo.WaterHeight = m_regInfo.EstateSettings.waterHeight;
remote_client.OutPacket(regionInfoPacket);
}

8
OpenSim/Region/Environment/LandManagement/Land.cs
View File

@@ -135,7 +135,7 @@ namespace OpenSim.Region.Environment.LandManagement
updatePacket.ParcelData.MaxPrims =
Convert.ToInt32(
Math.Round((Convert.ToDecimal(landData.area)/Convert.ToDecimal(65536))*15000*
Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));
Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
}
else
{
@@ -152,12 +152,12 @@ namespace OpenSim.Region.Environment.LandManagement
updatePacket.ParcelData.OwnerID = landData.ownerID;
updatePacket.ParcelData.OwnerPrims = landData.ownerPrims;
updatePacket.ParcelData.ParcelFlags = landData.landFlags;
updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.estateSettings.objectBonusFactor;
updatePacket.ParcelData.ParcelPrimBonus = m_scene.RegionInfo.EstateSettings.objectBonusFactor;
updatePacket.ParcelData.PassHours = landData.passHours;
updatePacket.ParcelData.PassPrice = landData.passPrice;
updatePacket.ParcelData.PublicCount = 0; //unemplemented
uint regionFlags = (uint) m_scene.RegionInfo.estateSettings.regionFlags;
uint regionFlags = (uint) m_scene.RegionInfo.EstateSettings.regionFlags;
updatePacket.ParcelData.RegionDenyAnonymous = ((regionFlags & (uint) Simulator.RegionFlags.DenyAnonymous) >
0);
updatePacket.ParcelData.RegionDenyIdentified = ((regionFlags & (uint) Simulator.RegionFlags.DenyIdentified) >
@@ -178,7 +178,7 @@ namespace OpenSim.Region.Environment.LandManagement
updatePacket.ParcelData.SimWideMaxPrims =
Convert.ToInt32(
Math.Round((Convert.ToDecimal(landData.simwideArea)/Convert.ToDecimal(65536))*15000*
Convert.ToDecimal(m_scene.RegionInfo.estateSettings.objectBonusFactor)));
Convert.ToDecimal(m_scene.RegionInfo.EstateSettings.objectBonusFactor)));
}
else
{

24
OpenSim/Region/Environment/Scenes/Scene.cs
View File

@@ -469,7 +469,7 @@ namespace OpenSim.Region.Environment.Scenes
double[,] map = storageManager.DataStore.LoadTerrain();
if (map == null)
{
if (string.IsNullOrEmpty(m_regInfo.estateSettings.terrainFile))
if (string.IsNullOrEmpty(m_regInfo.EstateSettings.terrainFile))
{
MainLog.Instance.Verbose("TERRAIN", "No default terrain. Generating a new terrain.");
Terrain.HillsGenerator();
@@ -480,8 +480,8 @@ namespace OpenSim.Region.Environment.Scenes
{
try
{
Terrain.LoadFromFileF32(m_regInfo.estateSettings.terrainFile);
Terrain *= m_regInfo.estateSettings.terrainMultiplier;
Terrain.LoadFromFileF32(m_regInfo.EstateSettings.terrainFile);
Terrain *= m_regInfo.EstateSettings.terrainMultiplier;
}
catch
{
@@ -511,9 +511,9 @@ namespace OpenSim.Region.Environment.Scenes
{
//create a texture asset of the terrain
byte[] data = Terrain.ExportJpegImage("defaultstripe.png");
m_regInfo.estateSettings.terrainImageID = LLUUID.Random();
m_regInfo.EstateSettings.terrainImageID = LLUUID.Random();
AssetBase asset = new AssetBase();
asset.FullID = m_regInfo.estateSettings.terrainImageID;
asset.FullID = m_regInfo.EstateSettings.terrainImageID;
asset.Data = data;
asset.Name = "terrainImage";
asset.Type = 0;
@@ -1001,12 +1001,20 @@ namespace OpenSim.Region.Environment.Scenes
/// <summary>
///
/// </summary>
/// <param name="whatToDo"></param>
public void ForEachScenePresence(Action<ScenePresence> whatToDo)
/// <param name="action"></param>
public void ForEachScenePresence(Action<ScenePresence> action)
{
foreach (ScenePresence presence in m_scenePresences.Values)
{
whatToDo(presence);
action(presence);
}
}
public void ForEachObject(Action<SceneObjectGroup> action)
{
foreach (SceneObjectGroup presence in m_sceneObjects.Values)
{
action(presence);
}
}