diff options
author | Justin Clark-Casey (justincc) | 2010-12-14 00:11:41 +0000 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-12-14 00:11:41 +0000 |
commit | e62b3dba8a1b8c816d6b09dc1f14b915f1560afe (patch) | |
tree | 19d945106d9d3c1147d441ab9351e9f33c910a36 /OpenSim/Region/Framework/Scenes | |
parent | Trigger event with flag CHANGED_LINK when agent sits on objects that have not... (diff) | |
download | opensim-SC_OLD-e62b3dba8a1b8c816d6b09dc1f14b915f1560afe.zip opensim-SC_OLD-e62b3dba8a1b8c816d6b09dc1f14b915f1560afe.tar.gz opensim-SC_OLD-e62b3dba8a1b8c816d6b09dc1f14b915f1560afe.tar.bz2 opensim-SC_OLD-e62b3dba8a1b8c816d6b09dc1f14b915f1560afe.tar.xz |
reinstate IAttachmentsModule.UpdateAttachmentPosition() since this is being used by a 3rd party region module and contains non-obvious attachment specific code
There are no functional changes. UpdateAttachmentPosition() is adapted to the new approach of only saving attachment state on logout
Diffstat (limited to 'OpenSim/Region/Framework/Scenes')
-rw-r--r-- | OpenSim/Region/Framework/Scenes/SceneGraph.cs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/OpenSim/Region/Framework/Scenes/SceneGraph.cs b/OpenSim/Region/Framework/Scenes/SceneGraph.cs index 78e5da3..a2ed54f 100644 --- a/OpenSim/Region/Framework/Scenes/SceneGraph.cs +++ b/OpenSim/Region/Framework/Scenes/SceneGraph.cs | |||
@@ -1281,13 +1281,8 @@ namespace OpenSim.Region.Framework.Scenes | |||
1281 | { | 1281 | { |
1282 | if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) | 1282 | if (group.IsAttachment || (group.RootPart.Shape.PCode == 9 && group.RootPart.Shape.State != 0)) |
1283 | { | 1283 | { |
1284 | // Set the new attachment point data in the object | 1284 | if (m_parentScene.AttachmentsModule != null) |
1285 | byte attachmentPoint = group.GetAttachmentPoint(); | 1285 | m_parentScene.AttachmentsModule.UpdateAttachmentPosition(group, pos); |
1286 | group.UpdateGroupPosition(pos); | ||
1287 | group.RootPart.IsAttachment = false; | ||
1288 | group.AbsolutePosition = group.RootPart.AttachedPos; | ||
1289 | group.SetAttachmentPoint(attachmentPoint); | ||
1290 | group.HasGroupChanged = true; | ||
1291 | } | 1286 | } |
1292 | else | 1287 | else |
1293 | { | 1288 | { |