mirror of
https://github.com/opensim/opensim.git
synced 2026-08-07 09:45:47 +08:00
* Fixed attaching objects that are in-world.
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user