diff options
| author | Melanie Thielker | 2008-11-22 00:23:48 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-22 00:23:48 +0000 |
| commit | 691c4bc756b9565e648ff8ad88cfbfabd1b0be76 (patch) | |
| tree | 252ba1f51e6c7c8f6eef8431869d83b704ec2803 /OpenSim/Region/Environment/Scenes/SceneGraph.cs | |
| parent | Introducing IPresenceModule (diff) | |
| download | opensim-SC_OLD-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.zip opensim-SC_OLD-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.gz opensim-SC_OLD-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.bz2 opensim-SC_OLD-691c4bc756b9565e648ff8ad88cfbfabd1b0be76.tar.xz | |
Mantis #2442
Attempt to reinstate the Object Entry flag in parcel settings
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneGraph.cs')
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneGraph.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs index 4c15da2..f1ef6c3 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs | |||
| @@ -1185,7 +1185,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1185 | } | 1185 | } |
| 1186 | else | 1186 | else |
| 1187 | { | 1187 | { |
| 1188 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment) | 1188 | if ((m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) || group.IsAttachment) |
| 1189 | { | 1189 | { |
| 1190 | group.UpdateGroupPosition(pos); | 1190 | group.UpdateGroupPosition(pos); |
| 1191 | } | 1191 | } |