diff options
author | Melanie | 2012-06-04 21:05:56 +0200 |
---|---|---|
committer | Melanie | 2012-06-04 21:05:56 +0200 |
commit | 28e5abd9176aeba3b5004d07748ae88cccbcd57a (patch) | |
tree | 77df0dc831f32e55059c5f7f582ed7e66bc35284 /OpenSim/Region/Framework | |
parent | When regions are set to shut down the instance, always send notifications to (diff) | |
download | opensim-SC_OLD-28e5abd9176aeba3b5004d07748ae88cccbcd57a.zip opensim-SC_OLD-28e5abd9176aeba3b5004d07748ae88cccbcd57a.tar.gz opensim-SC_OLD-28e5abd9176aeba3b5004d07748ae88cccbcd57a.tar.bz2 opensim-SC_OLD-28e5abd9176aeba3b5004d07748ae88cccbcd57a.tar.xz |
Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach positions.
Diffstat (limited to 'OpenSim/Region/Framework')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 69ce967..0516cb1 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | |||
@@ -65,7 +65,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
65 | /// <param name="AttachmentPt"></param> | 65 | /// <param name="AttachmentPt"></param> |
66 | /// <param name="silent"></param> | 66 | /// <param name="silent"></param> |
67 | /// <returns>true if the object was successfully attached, false otherwise</returns> | 67 | /// <returns>true if the object was successfully attached, false otherwise</returns> |
68 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent); | 68 | bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo); |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
71 | /// Rez an attachment from user inventory and change inventory status to match. | 71 | /// Rez an attachment from user inventory and change inventory status to match. |
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs index a9a4cda..6a120c1 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.cs | |||
@@ -2692,7 +2692,7 @@ namespace OpenSim.Region.Framework.Scenes | |||
2692 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); | 2692 | RootPrim.RemFlag(PrimFlags.TemporaryOnRez); |
2693 | 2693 | ||
2694 | if (AttachmentsModule != null) | 2694 | if (AttachmentsModule != null) |
2695 | AttachmentsModule.AttachObject(sp, grp, 0, false); | 2695 | AttachmentsModule.AttachObject(sp, grp, 0, false, false); |
2696 | } | 2696 | } |
2697 | else | 2697 | else |
2698 | { | 2698 | { |