Merge branch 'master' into careminster

Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
author: Melanie 2012-08-14 02:11:13 +0100
committer: Melanie 2012-08-14 02:11:13 +0100
commit: 053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch)
tree: 772fd824cbbe5a6bc594875ac3ee03c00115cef5 /OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
parent: Merge branch 'master' into careminster (diff)
parent: Implement the temp attachments. UNTESTED (diff)
download: opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip
opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz
opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2
opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 11a13e1..90a13a7 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
        /// <param name="AttachmentPt"></param>
        /// <param name="silent"></param>
        /// <returns>true if the object was successfully attached, false otherwise</returns>
-        bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo);
+        bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp);
        /// <summary>
        /// Rez an attachment from user inventory and change inventory status to match.
author	Melanie	2012-08-14 02:11:13 +0100
committer	Melanie	2012-08-14 02:11:13 +0100
commit	053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch)
tree	772fd824cbbe5a6bc594875ac3ee03c00115cef5 /OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
parent	Merge branch 'master' into careminster (diff)
parent	Implement the temp attachments. UNTESTED (diff)
download	opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2 opensim-SC_OLD-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz

diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs index 11a13e1..90a13a7 100644 --- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -84,7 +84,7 @@ namespace OpenSim.Region.Framework.Interfaces
84	/// <param name="AttachmentPt"></param>	84	/// <param name="AttachmentPt"></param>
85	/// <param name="silent"></param>	85	/// <param name="silent"></param>
86	/// <returns>true if the object was successfully attached, false otherwise</returns>	86	/// <returns>true if the object was successfully attached, false otherwise</returns>
87	bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo);	87	bool AttachObject(IScenePresence sp, SceneObjectGroup grp, uint AttachmentPt, bool silent, bool useAttachmentInfo, bool temp);
88		88
89	/// <summary>	89	/// <summary>
90	/// Rez an attachment from user inventory and change inventory status to match.	90	/// Rez an attachment from user inventory and change inventory status to match.