diff options
* Changed a number of field names to ccc (public members shouldn't be called m_)
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index e4b109c..55b3ca7 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -1125,13 +1125,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1125 | if (group != null) | 1125 | if (group != null) |
1126 | { | 1126 | { |
1127 | // LLVector3 oldPos = group.AbsolutePosition; | 1127 | // LLVector3 oldPos = group.AbsolutePosition; |
1128 | if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) | 1128 | if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment) |
1129 | { | 1129 | { |
1130 | group.SendGroupTerseUpdate(); | 1130 | group.SendGroupTerseUpdate(); |
1131 | return; | 1131 | return; |
1132 | } | 1132 | } |
1133 | 1133 | ||
1134 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment) | 1134 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) |
1135 | { | 1135 | { |
1136 | group.UpdateSinglePosition(pos, localID); | 1136 | group.UpdateSinglePosition(pos, localID); |
1137 | } | 1137 | } |
@@ -1151,19 +1151,19 @@ namespace OpenSim.Region.Environment.Scenes | |||
1151 | { | 1151 | { |
1152 | 1152 | ||
1153 | // LLVector3 oldPos = group.AbsolutePosition; | 1153 | // LLVector3 oldPos = group.AbsolutePosition; |
1154 | if (group.RootPart.m_IsAttachment) | 1154 | if (group.RootPart.IsAttachment) |
1155 | { | 1155 | { |
1156 | group.UpdateGroupPosition(pos); | 1156 | group.UpdateGroupPosition(pos); |
1157 | } | 1157 | } |
1158 | else | 1158 | else |
1159 | { | 1159 | { |
1160 | if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.m_IsAttachment) | 1160 | if (!m_parentScene.ExternalChecks.ExternalChecksCanObjectEntry(group.UUID,pos) && !group.RootPart.IsAttachment) |
1161 | { | 1161 | { |
1162 | group.SendGroupTerseUpdate(); | 1162 | group.SendGroupTerseUpdate(); |
1163 | 1163 | ||
1164 | return; | 1164 | return; |
1165 | } | 1165 | } |
1166 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.m_IsAttachment) | 1166 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) |
1167 | { | 1167 | { |
1168 | group.UpdateGroupPosition(pos); | 1168 | group.UpdateGroupPosition(pos); |
1169 | } | 1169 | } |