ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

seems to compile ( tests comented out)

Browse Source
This commit is contained in:
UbitUmarov
2015-09-02 19:54:53 +01:00
parent 371c9dd2af
commit a11edceb00
157 changed files with 1315 additions and 9792 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,14 +153,6 @@ namespace OpenSim.Region.OptionalModules
ILandObject newParcel = scene.LandChannel.GetLandObject(newPoint.X, newPoint.Y);
<<<<<<< HEAD
// newParcel will be null only if it outside of our current region. If this is the case, then the
// receiving permissions will perform the check.
if (newParcel == null)
return true;
// The prim hasn't crossed a region boundary so we don't need to worry
=======
if (newParcel == null)
return true;
@@ -168,7 +160,6 @@ namespace OpenSim.Region.OptionalModules
ILandObject oldParcel = scene.LandChannel.GetLandObject(oldPoint.X, oldPoint.Y);
// The prim hasn't crossed a region boundry so we don't need to worry
>>>>>>> avn/ubitvar
// about prim counts here
if(oldParcel != null && oldParcel.Equals(newParcel))
{