From e45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1 Mon Sep 17 00:00:00 2001
From: Teravus Ovares
Date: Wed, 14 May 2008 21:17:57 +0000
Subject: * Fixed attaching objects that are in-world.

---
 OpenSim/Region/Environment/Scenes/InnerScene.cs          | 2 +-
 OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'OpenSim/Region/Environment/Scenes')

diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 28270aa..6d00f71 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -397,7 +397,7 @@ namespace OpenSim.Region.Environment.Scenes
                     if (((SceneObjectGroup)obj).LocalId == objectLocalID)
                     {
                         SceneObjectGroup group = (SceneObjectGroup)obj;
-                        if (m_parentScene.ExternalChecks.ExternalChecksCanEditScript(obj.UUID, remoteClient.AgentId))
+                        if (m_parentScene.ExternalChecks.ExternalChecksCanTakeObject(obj.UUID, remoteClient.AgentId))
                         {
                             // If the attachment point isn't the same as the one previously used
                             // set it's offset position = 0 so that it appears on the attachment point
diff --git a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
index 99d19df..aa4e043 100644
--- a/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
@@ -118,11 +118,11 @@ namespace OpenSim.Region.Environment.Scenes
                     CanTakeObjectCheckFunctions.Remove(delegateFunc);
             }
 
-            public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID stealer)
+            public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID AvatarTakingUUID)
             {
                 foreach (CanTakeObject check in CanTakeObjectCheckFunctions)
                 {
-                    if (check(objectID, stealer, m_scene) == false)
+                    if (check(objectID, AvatarTakingUUID, m_scene) == false)
                     {
                         return false;
                     }
-- 
cgit v1.1