1 files changed, 69 insertions, 24 deletions

diff --git a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
index 0bf23f1..d3c46c9 100644
--- a/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
+++ b/OpenSim/Region/OptionalModules/PrimLimitsModule/PrimLimitsModule.cs
@@ -26,8 +26,9 @@
  */
 
 using System;
-using System.Reflection;
 using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
 using log4net;
 using Mono.Addins;
 using Nini.Config;
@@ -57,12 +58,10 @@ namespace OpenSim.Region.OptionalModules
         
         public void Initialise(IConfigSource config)
         {
-            //IConfig myConfig = config.Configs["Startup"];
-
             string permissionModules = Util.GetConfigVarFromSections<string>(config, "permissionmodules",
                 new string[] { "Startup", "Permissions" }, "DefaultPermissionsModule"); 
 
-            List<string> modules=new List<string>(permissionModules.Split(','));
+            List<string> modules = new List<string>(permissionModules.Split(',').Select(m => m.Trim()));
 
             if(!modules.Contains("PrimLimitsModule"))
                 return;
@@ -103,20 +102,34 @@ namespace OpenSim.Region.OptionalModules
         public void RegionLoaded(Scene scene)
         {
             m_dialogModule = scene.RequestModuleInterface<IDialogModule>();
-        }                
+        }
 
-        private bool CanRezObject(int objectCount, UUID owner, Vector3 objectPosition, Scene scene)
+        private bool CanRezObject(int objectCount, UUID ownerID, Vector3 objectPosition, Scene scene)
         {
             ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            int usedPrims = lo.PrimCounts.Total;
-            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
 
-            if (objectCount + usedPrims > simulatorCapacity)
+            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+
+            if (response != null)
             {
-                m_dialogModule.SendAlertToUser(owner, "Unable to rez object because the parcel is too full");
+                m_dialogModule.SendAlertToUser(ownerID, response);
                 return false;
             }
+            return true;
+        }
 
+        //OnDuplicateObject
+        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID ownerID, Scene scene, Vector3 objectPosition)
+        {
+            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
+
+            string response = DoCommonChecks(objectCount, ownerID, lo, scene);
+
+            if (response != null)
+            {
+                m_dialogModule.SendAlertToUser(ownerID, response);
+                return false;
+            }
             return true;
         }
 
@@ -140,6 +153,14 @@ 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;
 
@@ -147,6 +168,7 @@ 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))
             {
@@ -158,30 +180,53 @@ namespace OpenSim.Region.OptionalModules
             int simulatorCapacity = newParcel.GetSimulatorMaxPrimCount();
 
             // TODO: Add Special Case here for temporary prims
-            
-            if(objectCount + usedPrims > simulatorCapacity)
+
+            string response = DoCommonChecks(objectCount, obj.OwnerID, newParcel, scene);
+
+            if (response != null)
             {
-                m_dialogModule.SendAlertToUser(obj.OwnerID, "Unable to move object because the destination parcel  is too full");
+                m_dialogModule.SendAlertToUser(obj.OwnerID, response);
                 return false;
             }
-
             return true;
         }
 
-        //OnDuplicateObject
-        private bool CanDuplicateObject(int objectCount, UUID objectID, UUID owner, Scene scene, Vector3 objectPosition)
+        private string DoCommonChecks(int objectCount, UUID ownerID, ILandObject lo, Scene scene)
         {
-            ILandObject lo = scene.LandChannel.GetLandObject(objectPosition.X, objectPosition.Y);
-            int usedPrims = lo.PrimCounts.Total;
-            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
+            string response = null;
 
-            if(objectCount + usedPrims > simulatorCapacity)
+            int simulatorCapacity = lo.GetSimulatorMaxPrimCount();
+            if ((objectCount + lo.PrimCounts.Total) > simulatorCapacity)
             {
-                m_dialogModule.SendAlertToUser(owner, "Unable to duplicate object because the parcel is too full");
-                return false;
+                response = "Unable to rez object because the parcel is too full";
             }
-
-            return true;
+            else
+            {
+                int maxPrimsPerUser = scene.RegionInfo.MaxPrimsPerUser;
+                if (maxPrimsPerUser >= 0)
+                {
+                    // per-user prim limit is set
+                    if (ownerID != lo.LandData.OwnerID || lo.LandData.IsGroupOwned)
+                    {
+                        // caller is not the sole Parcel owner
+                        EstateSettings estateSettings = scene.RegionInfo.EstateSettings;
+                        if (ownerID != estateSettings.EstateOwner)
+                        {
+                            // caller is NOT the Estate owner
+                            List<UUID> mgrs = new List<UUID>(estateSettings.EstateManagers);
+                            if (!mgrs.Contains(ownerID))
+                            {
+                                // caller is not an Estate Manager
+                                if ((lo.PrimCounts.Users[ownerID] + objectCount) >  maxPrimsPerUser)
+                                {
+                                    response = "Unable to rez object because you have reached your limit";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            return response;
         }
     }
 }