Merge branch 'avination' into careminster

OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

@@ -66,7 +66,7 @@ namespace OpenSim.Region.Framework.Interfaces
         /// <param name="sp">The presence closing</param>
         /// <param name="saveChanged">Save changed attachments.</param>
         /// <param name="saveAllScripted">Save attachments with scripts even if they haven't changed.</para>
-        void DeRezAttachments(IScenePresence sp, bool saveChanged, bool saveAllScripted);
+        void DeRezAttachments(IScenePresence sp);
 
         /// <summary>
         /// Delete all the presence's attachments from the scene

OpenSim/Region/Framework/Interfaces/IScenePresence.cs

@@ -40,6 +40,8 @@ namespace OpenSim.Region.Framework.Interfaces
     /// </remarks>
     public interface IScenePresence : ISceneAgent
     {
+        PresenceType PresenceType { get; }
+
         /// <summary>
         /// Copy of the script states while the agent is in transit. This state may
         /// need to be placed back in case of transfer fail.
@@ -83,4 +85,4 @@ namespace OpenSim.Region.Framework.Interfaces
         void RemoveAttachment(SceneObjectGroup gobj);
         void ClearAttachments();
     }
-}
+}