diff options
| author | Melanie | 2012-06-06 14:16:19 +0100 |
|---|---|---|
| committer | Melanie | 2012-06-06 14:16:19 +0100 |
| commit | c0b21d92c2219c3bfd69e1467c28f20859dd4dc7 (patch) | |
| tree | edb346e1bcde87b1029babc753df9279e4102239 /OpenSim/Region/Framework/Interfaces | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | fix the real cause of double velocity (diff) | |
| download | opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.zip opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.gz opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.bz2 opensim-SC_OLD-c0b21d92c2219c3bfd69e1467c28f20859dd4dc7.tar.xz | |
Merge branch 'avination' into careminster
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces')
| -rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 2 |
1 files changed, 1 insertions, 1 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. |