aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Scenes/InnerScene.cs15
1 files changed, 1 insertions, 14 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index fdde801..4840133 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1137,13 +1137,6 @@ namespace OpenSim.Region.Environment.Scenes
1137 SceneObjectGroup group = GetGroupByPrim(localID); 1137 SceneObjectGroup group = GetGroupByPrim(localID);
1138 if (group != null) 1138 if (group != null)
1139 { 1139 {
1140 // Vector3 oldPos = group.AbsolutePosition;
1141 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment)
1142 {
1143 group.SendGroupTerseUpdate();
1144 return;
1145 }
1146
1147 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) 1140 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
1148 { 1141 {
1149 group.UpdateSinglePosition(pos, localID); 1142 group.UpdateSinglePosition(pos, localID);
@@ -1170,13 +1163,7 @@ namespace OpenSim.Region.Environment.Scenes
1170 } 1163 }
1171 else 1164 else
1172 { 1165 {
1173 if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment) 1166 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
1174 {
1175 group.SendGroupTerseUpdate();
1176
1177 return;
1178 }
1179 if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment)
1180 { 1167 {
1181 group.UpdateGroupPosition(pos); 1168 group.UpdateGroupPosition(pos);
1182 } 1169 }