2 files changed, 11 insertions, 32 deletions

diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
index e82dc7f..64bfb4f 100644
--- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
+++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
@@ -550,15 +550,15 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments
 //                    group.Name, group.LocalId, sp.Name, attachmentPt, silent);
 
 
-            if (group.GetSittingAvatarsCount() != 0)
-            {
-                if (DebugLevel > 0)
-                    m_log.WarnFormat(
-                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
-                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
-
-                return false;
-            }
+////            if (group.GetSittingAvatarsCount() != 0)
+////            {
+////                if (DebugLevel > 0)
+////                    m_log.WarnFormat(
+////                        "[ATTACHMENTS MODULE]: Ignoring request to attach {0} {1} to {2} on {3} since {4} avatars are still sitting on it",
+////                        group.Name, group.LocalId, sp.Name, attachmentPt, group.GetSittingAvatarsCount());
+////
+////                return false;
+////            }
 
             Vector3 attachPos = group.AbsolutePosition;
 
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
index facb7a0..0d6fa17 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
@@ -919,29 +919,8 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
             }
 
             int primcount = 0;
-            if(attachment)
-            {
-                foreach (SceneObjectGroup g in objlist)
-                {
-                    if(g.RootPart.Shape != null)
-                    {
-                        PCode code = (PCode)g.RootPart.Shape.PCode;
-                        if(code == PCode.Grass || code == PCode.NewTree || code == PCode.Tree)
-                        {
-                            // dont wear vegetables
-                            remoteClient.SendAgentAlertMessage("You cannot wear system plants. They could grow roots inside your avatar", false);
-                            return null;
-                        }
-                    }
-                    primcount += g.PrimCount;
-                }
-            }
-            else
-            {
-                foreach (SceneObjectGroup g in objlist)
-                    primcount += g.PrimCount;
-            }
-
+            foreach (SceneObjectGroup g in objlist)
+                primcount += g.PrimCount;
 
             if (!m_Scene.Permissions.CanRezObject(
                 primcount, remoteClient.AgentId, pos)