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

Merge branch 'avination' into ubitwork

avinationmerge
UbitUmarov 2012-05-21 12:47:28 +01:00
parent 85f5789993 7305d2e0ef
commit b92ecc5382
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
View File

@ -368,4 +368,4 @@ namespace OpenSim.Region.Framework.Scenes
} }
} }
} }
} }

2
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
View File

@ -3741,7 +3741,7 @@ namespace OpenSim.Region.Framework.Scenes
} }
if ((change & ObjectChangeType.Position) != 0) if ((change & ObjectChangeType.Position) != 0)
{ {
if (m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position)) if (IsAttachment || m_scene.Permissions.CanObjectEntry(group.UUID, false, data.position))
UpdateGroupPosition(data.position); UpdateGroupPosition(data.position);
updateType = updatetype.groupterse; updateType = updatetype.groupterse;
} }