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

minor: Only calculate fetched usedPrims and simulatorCapacity info in PrimLimitsModule.CanObjectEnter() when we know for sure that we need them.

0.8.0.3
Justin Clark-Casey (justincc) 2014-04-02 01:05:37 +01:00
parent 7cb1690589
commit 444737c830
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
View File

@ -131,9 +131,6 @@ namespace OpenSim.Region.OptionalModules
// receiving permissions will perform the check. // receiving permissions will perform the check.
if (newParcel == null) if (newParcel == null)
return true; return true;
int usedPrims = newParcel.PrimCounts.Total;
int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
// The prim hasn't crossed a region boundry so we don't need to worry // The prim hasn't crossed a region boundry so we don't need to worry
// about prim counts here // about prim counts here
@ -150,8 +147,11 @@ namespace OpenSim.Region.OptionalModules
} }
// TODO: Add Special Case here for temporary prims // TODO: Add Special Case here for temporary prims
int usedPrims = newParcel.PrimCounts.Total;
int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
if(objectCount + usedPrims > simulatorCapacity) if (objectCount + usedPrims > simulatorCapacity)
{ {
m_dialogModule.SendAlertToUser(obj.OwnerID, "Unable to move object because the destination parcel is too full"); m_dialogModule.SendAlertToUser(obj.OwnerID, "Unable to move object because the destination parcel is too full");
return false; return false;