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

refactor: remove thisObject argument from ILandObject.Get*MaxPrimCount() instance methods since it didn't make sense to use anything other than the instance themselves.

bulletsim
Justin Clark-Casey (justincc) 2011-05-14 02:42:47 +01:00
parent bef1ffa7db
commit 340e3ccf16
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/ILandObject.cs
View File

@ -35,8 +35,8 @@ namespace OpenSim.Framework
public interface ILandObject public interface ILandObject
{ {
int GetParcelMaxPrimCount(ILandObject thisObject); int GetParcelMaxPrimCount();
int GetSimulatorMaxPrimCount(ILandObject thisObject); int GetSimulatorMaxPrimCount();
int GetPrimsFree(); int GetPrimsFree();
LandData LandData { get; set; } LandData LandData { get; set; }

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

@ -67,7 +67,7 @@ namespace OpenSim.Region.CoreModules.World.Land
public int GetPrimsFree() public int GetPrimsFree()
{ {
m_scene.EventManager.TriggerParcelPrimCountUpdate(); m_scene.EventManager.TriggerParcelPrimCountUpdate();
int free = GetSimulatorMaxPrimCount(this) - m_landData.SimwidePrims; int free = GetSimulatorMaxPrimCount() - m_landData.SimwidePrims;
return free; return free;
} }
@ -181,11 +181,11 @@ namespace OpenSim.Region.CoreModules.World.Land
overrideSimulatorMaxPrimCount = overrideDel; overrideSimulatorMaxPrimCount = overrideDel;
} }
public int GetParcelMaxPrimCount(ILandObject thisObject) public int GetParcelMaxPrimCount()
{ {
if (overrideParcelMaxPrimCount != null) if (overrideParcelMaxPrimCount != null)
{ {
return overrideParcelMaxPrimCount(thisObject); return overrideParcelMaxPrimCount(this);
} }
else else
{ {
@ -197,11 +197,12 @@ namespace OpenSim.Region.CoreModules.World.Land
return parcelMax; return parcelMax;
} }
} }
public int GetSimulatorMaxPrimCount(ILandObject thisObject)
public int GetSimulatorMaxPrimCount()
{ {
if (overrideSimulatorMaxPrimCount != null) if (overrideSimulatorMaxPrimCount != null)
{ {
return overrideSimulatorMaxPrimCount(thisObject); return overrideSimulatorMaxPrimCount(this);
} }
else else
{ {
@ -244,8 +245,8 @@ namespace OpenSim.Region.CoreModules.World.Land
remote_client.SendLandProperties(seq_id, remote_client.SendLandProperties(seq_id,
snap_selection, request_result, this, snap_selection, request_result, this,
(float)m_scene.RegionInfo.RegionSettings.ObjectBonus, (float)m_scene.RegionInfo.RegionSettings.ObjectBonus,
GetParcelMaxPrimCount(this), GetParcelMaxPrimCount(),
GetSimulatorMaxPrimCount(this), regionFlags); GetSimulatorMaxPrimCount(), regionFlags);
} }
public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client) public void UpdateLandProperties(LandUpdateArgs args, IClientAPI remote_client)

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

@ -9915,9 +9915,9 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
return 0; return 0;
if (sim_wide != 0) if (sim_wide != 0)
return lo.GetSimulatorMaxPrimCount(lo); return lo.GetSimulatorMaxPrimCount();
else else
return lo.GetParcelMaxPrimCount(lo); return lo.GetParcelMaxPrimCount();
} }
public LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param) public LSL_List llGetParcelDetails(LSL_Vector pos, LSL_List param)