diff options
author | Justin Clarke Casey | 2008-11-01 22:04:35 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-11-01 22:04:35 +0000 |
commit | 9366a234cf0dd09c0252f9af8a231c4b2865e556 (patch) | |
tree | 12ac4c2e25b048cb0b3962b1f9b3722b8e124126 /OpenSim/Region/Environment/Scenes/InnerScene.cs | |
parent | Fix a compile warning about unreachable code (diff) | |
download | opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.zip opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.gz opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.bz2 opensim-SC_OLD-9366a234cf0dd09c0252f9af8a231c4b2865e556.tar.xz |
* refactor: Convert most non SOP methods to use SOG.IsAttachment rather than SOP.IsAttachment
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/InnerScene.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/InnerScene.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs index 1e21a58..2189670 100644 --- a/OpenSim/Region/Environment/Scenes/InnerScene.cs +++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs | |||
@@ -1138,7 +1138,7 @@ namespace OpenSim.Region.Environment.Scenes | |||
1138 | SceneObjectGroup group = GetGroupByPrim(localID); | 1138 | SceneObjectGroup group = GetGroupByPrim(localID); |
1139 | if (group != null) | 1139 | if (group != null) |
1140 | { | 1140 | { |
1141 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) | 1141 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment) |
1142 | { | 1142 | { |
1143 | group.UpdateSinglePosition(pos, localID); | 1143 | group.UpdateSinglePosition(pos, localID); |
1144 | } | 1144 | } |
@@ -1158,13 +1158,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
1158 | { | 1158 | { |
1159 | 1159 | ||
1160 | // Vector3 oldPos = group.AbsolutePosition; | 1160 | // Vector3 oldPos = group.AbsolutePosition; |
1161 | if (group.RootPart.IsAttachment) | 1161 | if (group.IsAttachment) |
1162 | { | 1162 | { |
1163 | group.UpdateGroupPosition(pos); | 1163 | group.UpdateGroupPosition(pos); |
1164 | } | 1164 | } |
1165 | else | 1165 | else |
1166 | { | 1166 | { |
1167 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.RootPart.IsAttachment) | 1167 | if (m_parentScene.ExternalChecks.ExternalChecksCanMoveObject(group.UUID, remoteClient.AgentId) || group.IsAttachment) |
1168 | { | 1168 | { |
1169 | group.UpdateGroupPosition(pos); | 1169 | group.UpdateGroupPosition(pos); |
1170 | } | 1170 | } |