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

added in some extra variables, it sometimes thinks it is on the same parcel :( 

Signed-off-by: SignpostMarv <github@signpostmarv.name>
0.7.4.1
SignpostMarv 2012-07-12 17:22:43 +01:00 committed by Justin Clark-Casey (justincc)
parent b6cd3b625e
commit e3453dd9ca
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1946,10 +1946,12 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
else{ else{
LSL_List parcelID = new LSL_List(ScriptBaseClass.PARCEL_DETAILS_ID); LSL_List parcelID = new LSL_List(ScriptBaseClass.PARCEL_DETAILS_ID);
Vector3 objectPos = m_host.ParentGroup.RootPart.AbsolutePosition; Vector3 objectPos = m_host.ParentGroup.RootPart.AbsolutePosition;
bool sameParcel = string parcelA = llGetParcelDetails(new LSL_Vector(objectPos.X, objectPos.X, objectPos.X), parcelID).Data[0].ToString();
llGetParcelDetails(new LSL_Vector(pos.x, pos.y, pos.z), parcelID).Data[0] == string parcelB = llGetParcelDetails(pos, parcelID).Data[0].ToString();
llGetParcelDetails(pos, parcelID).Data[0] bool sameParcel = parcelA == parcelB;
; int objectPrimCount = m_host.ParentGroup.PrimCount;
LSL_Integer destParcelPrimCount = llGetParcelPrimCount(pos, ScriptBaseClass.PARCEL_COUNT_TOTAL, 0);
LSL_Integer max = llGetParcelMaxPrims(pos, 0);
if ( if (
llGetStatus((int)PrimFlags.Physics) == 1 || // return FALSE if physical. llGetStatus((int)PrimFlags.Physics) == 1 || // return FALSE if physical.
m_host.ParentGroup.IsAttachment || // return FALSE if attachment m_host.ParentGroup.IsAttachment || // return FALSE if attachment
@ -1964,7 +1966,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
// this check will only work if pos is within the region bounds. // this check will only work if pos is within the region bounds.
( (
!sameParcel && // if it's moving within the same parcel we do not need to check if the destination parcel will exceed capacity if the object is moved. !sameParcel && // if it's moving within the same parcel we do not need to check if the destination parcel will exceed capacity if the object is moved.
(llGetParcelPrimCount(pos, ScriptBaseClass.PARCEL_COUNT_TOTAL, 0) + m_host.ParentGroup.PrimCount) > llGetParcelMaxPrims(pos, 0) (destParcelPrimCount + objectPrimCount) > max
) )
// END RELIANCE ON WORK-AROUND // END RELIANCE ON WORK-AROUND
){ ){