Merge branch 'master' into careminster-presence-refactor

OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs

@@ -27,6 +27,7 @@
 
 using System;
 using OpenMetaverse;
+using OpenMetaverse.Packets;
 using OpenSim.Framework;
 using OpenSim.Region.Framework.Scenes;
 
@@ -81,6 +82,34 @@ namespace OpenSim.Region.Framework.Interfaces
         UUID RezSingleAttachmentFromInventory(
             IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
 
+        /// <summary>
+        /// Rez multiple attachments from a user's inventory
+        /// </summary>
+        /// <param name="remoteClient"></param>
+        /// <param name="header"></param>
+        /// <param name="objects"></param>
+        void RezMultipleAttachmentsFromInventory(
+            IClientAPI remoteClient,
+            RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
+            RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
+
+        /// <summary>
+        /// Detach an object from the avatar.
+        /// </summary>
+        ///
+        /// This method is called in response to a client's detach request, so we only update the information in
+        /// inventory
+        /// <param name="objectLocalID"></param>
+        /// <param name="remoteClient"></param>
+        void DetachObject(uint objectLocalID, IClientAPI remoteClient);
+            
+        /// <summary>
+        /// Detach the given item to the ground.
+        /// </summary>
+        /// <param name="itemID"></param>
+        /// <param name="remoteClient"></param>
+        void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient);
+            
         /// <summary>
         /// Update the user inventory to the attachment of an item
         /// </summary>

OpenSim/Region/Framework/Interfaces/IEntityInventory.cs

@@ -73,6 +73,9 @@ namespace OpenSim.Region.Framework.Interfaces
         /// </summary>
         void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource);
         
+        ArrayList GetScriptErrors(UUID itemID);
+        void ResumeScripts();
+
         /// <summary>
         /// Stop all the scripts in this entity.
         /// </summary>

OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs

@@ -90,8 +90,12 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
         /// settings in the archive will be ignored.
         /// </param>
+        /// <param name="skipAssets">
+        /// If true, the archive is loaded without loading any assets contained within it.  This is useful if the
+        /// assets are already known to be present in the grid's asset service.
+        /// </param>
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(string loadPath, bool merge, Guid requestId);
+        void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId);
         
         /// <summary>
         /// Dearchive a region from a stream.  This replaces the existing scene. 
@@ -113,7 +117,11 @@ namespace OpenSim.Region.Framework.Interfaces
         /// If true, the loaded region merges with the existing one rather than replacing it.  Any terrain or region
         /// settings in the archive will be ignored.
         /// </param>
+        /// <param name="skipAssets">
+        /// If true, the archive is loaded without loading any assets contained within it.  This is useful if the
+        /// assets are already known to be present in the grid's asset service.
+        /// </param
         /// <param name="requestId">If supplied, this request Id is later returned in the saved event</param>
-        void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);
+        void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId);
     }
 }

OpenSim/Region/Framework/Interfaces/IScriptModule.cs

@@ -41,6 +41,14 @@ namespace OpenSim.Region.Framework.Interfaces
         bool PostScriptEvent(UUID itemID, string name, Object[] args);
         bool PostObjectEvent(UUID itemID, string name, Object[] args);
 
+        // Suspend ALL scripts in a given scene object. The item ID
+        // is the UUID of a SOG, and the method acts on all contained
+        // scripts. This is different from the suspend/resume that
+        // can be issued by a client.
+        //
+        void SuspendScript(UUID itemID);
+        void ResumeScript(UUID itemID);
+
         ArrayList GetScriptErrors(UUID itemID);
     }
 }