OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Still related to mantis #7917, parcel prims info. Now sending the correct numbers for "Simulator primitive usage" related to the parcel owner, not the entire region.

LSLKeyTest
Diva Canto 2016-06-19 09:17:04 -07:00
parent ce7fa728ef
commit 12b73603cc
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/LandData.cs
View File

@ -620,7 +620,7 @@ namespace OpenSim.Framework
} }
/// <summary> /// <summary>
/// Number of meters^2 in the Simulator /// Number of meters^2 that the land owner has in the Simulator
/// </summary> /// </summary>
[XmlIgnore] [XmlIgnore]
public int SimwideArea public int SimwideArea

7
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -5076,12 +5076,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (landData.SimwideArea > 0) if (landData.SimwideArea > 0)
{ {
int simulatorCapacity = (int)((long)landData.SimwideArea * (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.RegionSettings.ObjectBonus updateMessage.SimWideMaxPrims = lo.GetSimulatorMaxPrimCount();
/ (long)m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY);
// Never report more than sim total capacity
if (simulatorCapacity > m_scene.RegionInfo.ObjectCapacity)
simulatorCapacity = m_scene.RegionInfo.ObjectCapacity;
updateMessage.SimWideMaxPrims = simulatorCapacity;
} }
else else
{ {

14
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
View File

@ -884,7 +884,7 @@ namespace OpenSim.Region.CoreModules.World.Land
} }
} }
public void FinalizeLandPrimCountUpdate() private void FinalizeLandPrimCountUpdate()
{ {
//Get Simwide prim count for owner //Get Simwide prim count for owner
Dictionary<UUID, List<LandObject>> landOwnersAndParcels = new Dictionary<UUID, List<LandObject>>(); Dictionary<UUID, List<LandObject>> landOwnersAndParcels = new Dictionary<UUID, List<LandObject>>();
@ -925,10 +925,10 @@ namespace OpenSim.Region.CoreModules.World.Land
public void EventManagerOnParcelPrimCountUpdate() public void EventManagerOnParcelPrimCountUpdate()
{ {
// m_log.DebugFormat( //m_log.DebugFormat(
// "[LAND MANAGEMENT MODULE]: Triggered EventManagerOnParcelPrimCountUpdate() for {0}", // "[land management module]: triggered eventmanageronparcelprimcountupdate() for {0}",
// m_scene.RegionInfo.RegionName); // m_scene.RegionInfo.RegionName);
ResetOverMeRecords(); ResetOverMeRecords();
EntityBase[] entities = m_scene.Entities.GetEntities(); EntityBase[] entities = m_scene.Entities.GetEntities();
foreach (EntityBase obj in entities) foreach (EntityBase obj in entities)
@ -1843,7 +1843,7 @@ namespace OpenSim.Region.CoreModules.World.Land
LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse(); LLSDRemoteParcelResponse response = new LLSDRemoteParcelResponse();
response.parcel_id = parcelID; response.parcel_id = parcelID;
m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID); //m_log.DebugFormat("[LAND MANAGEMENT MODULE]: Got parcelID {0}", parcelID);
return LLSDHelpers.SerialiseLLSDReply(response); return LLSDHelpers.SerialiseLLSDReply(response);
} }
@ -2306,12 +2306,14 @@ namespace OpenSim.Region.CoreModules.World.Land
cdl.AddRow("Other clean time", ld.OtherCleanTime); cdl.AddRow("Other clean time", ld.OtherCleanTime);
cdl.AddRow("Max Prims", lo.GetParcelMaxPrimCount()); cdl.AddRow("Max Prims", lo.GetParcelMaxPrimCount());
cdl.AddRow("Simwide Max Prims (owner)", lo.GetSimulatorMaxPrimCount());
IPrimCounts pc = lo.PrimCounts; IPrimCounts pc = lo.PrimCounts;
cdl.AddRow("Owner Prims", pc.Owner); cdl.AddRow("Owner Prims", pc.Owner);
cdl.AddRow("Group Prims", pc.Group); cdl.AddRow("Group Prims", pc.Group);
cdl.AddRow("Other Prims", pc.Others); cdl.AddRow("Other Prims", pc.Others);
cdl.AddRow("Selected Prims", pc.Selected); cdl.AddRow("Selected Prims", pc.Selected);
cdl.AddRow("Total Prims", pc.Total); cdl.AddRow("Total Prims", pc.Total);
cdl.AddRow("SimWide Prims (owner)", pc.Simulator);
cdl.AddRow("Music URL", ld.MusicURL); cdl.AddRow("Music URL", ld.MusicURL);
cdl.AddRow("Obscure Music", ld.ObscureMusic); cdl.AddRow("Obscure Music", ld.ObscureMusic);

3
OpenSim/Region/CoreModules/World/Land/LandObject.cs
View File

@ -362,7 +362,8 @@ namespace OpenSim.Region.CoreModules.World.Land
int simMax = (int)( (long)LandData.SimwideArea int simMax = (int)( (long)LandData.SimwideArea
* (long)m_scene.RegionInfo.ObjectCapacity * (long)m_scene.RegionInfo.ObjectCapacity
/ (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) ); / (long)(m_scene.RegionInfo.RegionSizeX * m_scene.RegionInfo.RegionSizeY) );
//m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}", LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax); //m_log.DebugFormat("Simwide Area: {0}, Capacity {1}, SimMax {2}, SimWidePrims {3}",
// LandData.SimwideArea, m_scene.RegionInfo.ObjectCapacity, simMax, LandData.SimwidePrims);
return simMax; return simMax;
} }
} }