diff options
author | Melanie | 2012-10-03 00:24:33 +0100 |
---|---|---|
committer | Melanie | 2012-10-03 00:24:33 +0100 |
commit | 23d5bafa7f5e7b23ea36300de8096c7dc84e51b0 (patch) | |
tree | 044eb97d800f1ce82bfb0367488eb8752b3e6aa6 /OpenSim/Region/CoreModules/Avatar/Attachments | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff) | |
download | opensim-SC_OLD-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.zip opensim-SC_OLD-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.gz opensim-SC_OLD-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.bz2 opensim-SC_OLD-23d5bafa7f5e7b23ea36300de8096c7dc84e51b0.tar.xz |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
Diffstat (limited to 'OpenSim/Region/CoreModules/Avatar/Attachments')
-rw-r--r-- | OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs index 8e886d4..e711afb 100644 --- a/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs +++ b/OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs | |||
@@ -475,6 +475,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
475 | 475 | ||
476 | public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId) | 476 | public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId) |
477 | { | 477 | { |
478 | DetachSingleAttachmentToGround(sp, soLocalId, sp.AbsolutePosition, Quaternion.Identity); | ||
479 | } | ||
480 | |||
481 | public void DetachSingleAttachmentToGround(IScenePresence sp, uint soLocalId, Vector3 absolutePos, Quaternion absoluteRot) | ||
482 | { | ||
478 | if (!Enabled) | 483 | if (!Enabled) |
479 | return; | 484 | return; |
480 | 485 | ||
@@ -516,7 +521,11 @@ namespace OpenSim.Region.CoreModules.Avatar.Attachments | |||
516 | so.FromItemID = UUID.Zero; | 521 | so.FromItemID = UUID.Zero; |
517 | 522 | ||
518 | SceneObjectPart rootPart = so.RootPart; | 523 | SceneObjectPart rootPart = so.RootPart; |
519 | so.AbsolutePosition = sp.AbsolutePosition; | 524 | so.AbsolutePosition = absolutePos; |
525 | if (absoluteRot != Quaternion.Identity) | ||
526 | { | ||
527 | so.UpdateGroupRotationR(absoluteRot); | ||
528 | } | ||
520 | so.AttachedAvatar = UUID.Zero; | 529 | so.AttachedAvatar = UUID.Zero; |
521 | rootPart.SetParentLocalId(0); | 530 | rootPart.SetParentLocalId(0); |
522 | so.ClearPartAttachmentData(); | 531 | so.ClearPartAttachmentData(); |