diff options
| author | Melanie Thielker | 2008-11-22 15:58:52 +0000 |
|---|---|---|
| committer | Melanie Thielker | 2008-11-22 15:58:52 +0000 |
| commit | e982a24f77e79129e8830dddb47fd045e1409ffc (patch) | |
| tree | e9a1e7d28db102127c9b95222e9f732e94b97a55 | |
| parent | Update svn properties, minor formatting cleanup. (diff) | |
| download | opensim-SC_OLD-e982a24f77e79129e8830dddb47fd045e1409ffc.zip opensim-SC_OLD-e982a24f77e79129e8830dddb47fd045e1409ffc.tar.gz opensim-SC_OLD-e982a24f77e79129e8830dddb47fd045e1409ffc.tar.bz2 opensim-SC_OLD-e982a24f77e79129e8830dddb47fd045e1409ffc.tar.xz | |
Remove a redundant check and add checking for attachments in parcels that
have no entry set, part 1
| -rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneGraph.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneGraph.cs b/OpenSim/Region/Environment/Scenes/SceneGraph.cs index f1ef6c3..c25ce3c 100644 --- a/OpenSim/Region/Environment/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Environment/Scenes/SceneGraph.cs | |||
| @@ -1179,13 +1179,13 @@ namespace OpenSim.Region.Environment.Scenes | |||
| 1179 | { | 1179 | { |
| 1180 | 1180 | ||
| 1181 | // Vector3 oldPos = group.AbsolutePosition; | 1181 | // Vector3 oldPos = group.AbsolutePosition; |
| 1182 | if (group.IsAttachment) | 1182 | if (group.IsAttachment || (group.RootPrim.Shape.PCode == 9 && group.RootPrim.Shape.State != 0)) |
| 1183 | { | 1183 | { |
| 1184 | group.UpdateGroupPosition(pos); | 1184 | group.UpdateGroupPosition(pos); |
| 1185 | } | 1185 | } |
| 1186 | else | 1186 | else |
| 1187 | { | 1187 | { |
| 1188 | if ((m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) || group.IsAttachment) | 1188 | if (m_parentScene.Permissions.CanMoveObject(group.UUID, remoteClient.AgentId) && m_parentScene.Permissions.CanObjectEntry(group.UUID, false, pos)) |
| 1189 | { | 1189 | { |
| 1190 | group.UpdateGroupPosition(pos); | 1190 | group.UpdateGroupPosition(pos); |
| 1191 | } | 1191 | } |