1 files changed, 11 insertions, 4 deletions

diff --git a/OpenSim/Region/Environment/PermissionManager.cs b/OpenSim/Region/Environment/PermissionManager.cs
index 2698d3f..1daf5c3 100644
--- a/OpenSim/Region/Environment/PermissionManager.cs
+++ b/OpenSim/Region/Environment/PermissionManager.cs
@@ -91,16 +91,23 @@ namespace OpenSim.Region.Environment
 

         #region Object Permissions

 

-        protected virtual bool GenericObjectPermission(LLUUID user, LLUUID obj)

+        protected virtual bool GenericObjectPermission(LLUUID user, LLUUID objId)

         {

             // Default: deny

             bool permission = false;

 

+            if( !m_scene.Entities.ContainsKey( objId ))

+            {

+                return false;

+            }

+            

             // If it's not an object, we cant edit it.

-            if (!(m_scene.Entities[obj] is SceneObjectGroup))

+            if (!(m_scene.Entities[objId] is SceneObjectGroup))

+            {

                 return false;

-

-            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[obj];

+            }

+            

+            SceneObjectGroup task = (SceneObjectGroup)m_scene.Entities[objId];

             LLUUID taskOwner = null;  

 

             // Object owners should be able to edit their own content