aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment/Scenes
diff options
context:
space:
mode:
authorTeravus Ovares2008-05-14 21:17:57 +0000
committerTeravus Ovares2008-05-14 21:17:57 +0000
commite45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1 (patch)
treea0d8cc8444954d0c9961e88feb601e0b496d42fb /OpenSim/Region/Environment/Scenes
parent* Refactor: Remove SceneObjectGroup.GetScenePresences() in favour of a direct... (diff)
downloadopensim-SC-e45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1.zip
opensim-SC-e45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1.tar.gz
opensim-SC-e45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1.tar.bz2
opensim-SC-e45ace9b5482408fcc5c3bd7c2f3a16ab71d50a1.tar.xz
* Fixed attaching objects that are in-world.
Diffstat (limited to '')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs2
-rw-r--r--OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs4
2 files changed, 3 insertions, 3 deletions
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
397 if (((SceneObjectGroup)obj).LocalId == objectLocalID) 397 if (((SceneObjectGroup)obj).LocalId == objectLocalID)
398 { 398 {
399 SceneObjectGroup group = (SceneObjectGroup)obj; 399 SceneObjectGroup group = (SceneObjectGroup)obj;
400 if (m_parentScene.ExternalChecks.ExternalChecksCanEditScript(obj.UUID, remoteClient.AgentId)) 400 if (m_parentScene.ExternalChecks.ExternalChecksCanTakeObject(obj.UUID, remoteClient.AgentId))
401 { 401 {
402 // If the attachment point isn't the same as the one previously used 402 // If the attachment point isn't the same as the one previously used
403 // set it's offset position = 0 so that it appears on the attachment point 403 // 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
118 CanTakeObjectCheckFunctions.Remove(delegateFunc); 118 CanTakeObjectCheckFunctions.Remove(delegateFunc);
119 } 119 }
120 120
121 public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID stealer) 121 public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID AvatarTakingUUID)
122 { 122 {
123 foreach (CanTakeObject check in CanTakeObjectCheckFunctions) 123 foreach (CanTakeObject check in CanTakeObjectCheckFunctions)
124 { 124 {
125 if (check(objectID, stealer, m_scene) == false) 125 if (check(objectID, AvatarTakingUUID, m_scene) == false)
126 { 126 {
127 return false; 127 return false;
128 } 128 }