OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Fixed attaching objects that are in-world.

0.6.0-stable
Teravus Ovares 2008-05-14 21:17:57 +00:00
parent 587f6ab645
commit e45ace9b54
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Environment/Scenes/InnerScene.cs
View File

@ -397,7 +397,7 @@ namespace OpenSim.Region.Environment.Scenes
if (((SceneObjectGroup)obj).LocalId == objectLocalID) if (((SceneObjectGroup)obj).LocalId == objectLocalID)
{ {
SceneObjectGroup group = (SceneObjectGroup)obj; 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 // 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 // set it's offset position = 0 so that it appears on the attachment point

4
OpenSim/Region/Environment/Scenes/SceneExternalChecks.cs
View File

@ -118,11 +118,11 @@ namespace OpenSim.Region.Environment.Scenes
CanTakeObjectCheckFunctions.Remove(delegateFunc); CanTakeObjectCheckFunctions.Remove(delegateFunc);
} }
public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID stealer) public bool ExternalChecksCanTakeObject(LLUUID objectID, LLUUID AvatarTakingUUID)
{ {
foreach (CanTakeObject check in CanTakeObjectCheckFunctions) foreach (CanTakeObject check in CanTakeObjectCheckFunctions)
{ {
if (check(objectID, stealer, m_scene) == false) if (check(objectID, AvatarTakingUUID, m_scene) == false)
{ {
return false; return false;
} }