From ba3491c76e2d7cc7187a025dccd782790929f0b7 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Thu, 12 Jan 2012 19:06:46 +0000
Subject: Add permissions checks for owned avatars to all other osNpc*
 functions.

This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
---
 OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'OpenSim/Region/OptionalModules/World')

diff --git a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
index 8f9b513..d90309f 100644
--- a/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
@@ -266,16 +266,13 @@ namespace OpenSim.Region.OptionalModules.World.NPC
             return UUID.Zero;
         }
 
-        public bool DeleteNPC(UUID agentID, UUID callerID, Scene scene)
+        public bool DeleteNPC(UUID agentID, Scene scene)
         {
             lock (m_avatars)
             {
                 NPCAvatar av;
                 if (m_avatars.TryGetValue(agentID, out av))
                 {
-                    if (!CheckPermissions(av, callerID));
-                        return false;
-
                     scene.RemoveClient(agentID, false);
                     m_avatars.Remove(agentID);
 
-- 
cgit v1.1