From bf3956aeb0a44d0dd455e330234fcf0e18f5ea43 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Apr 2010 22:29:11 +0100
Subject: Add --skip-assets option to load oar. This allows you to load an oar
without loading its assets. This is useful if you know that the required
assets are already in the asset service, since loading without assets is
quicker. This option will become more useful when the ability to save oars
without assets is added, which should happen fairly soon. At this point
there will also be better documentation.
---
OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
index 991d60c..89e59d0 100644
--- a/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs
+++ b/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.
///
+ ///
+ /// 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.
+ ///
/// If supplied, this request Id is later returned in the saved event
- void DearchiveRegion(string loadPath, bool merge, Guid requestId);
+ void DearchiveRegion(string loadPath, bool merge, bool skipAssets, Guid requestId);
///
/// 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.
///
+ ///
+ /// 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.
+ /// If supplied, this request Id is later returned in the saved event
- void DearchiveRegion(Stream loadStream, bool merge, Guid requestId);
+ void DearchiveRegion(Stream loadStream, bool merge, bool skipAssets, Guid requestId);
}
}
--
cgit v1.1
From 17d023ba5bb54f832adc8c0d4ba79b2a0e67c434 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Apr 2010 22:54:25 +0100
Subject: refactor: crudely move the RezMultipleAttachments() method into the
AttachmentsModule
---
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 12 ++++++++++++
1 file changed, 12 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 0222b02..77e9a7e 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/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;
@@ -82,6 +83,17 @@ namespace OpenSim.Region.Framework.Interfaces
IClientAPI remoteClient, UUID itemID, uint AttachmentPt, bool updateInventoryStatus);
///
+ /// Rez multiple attachments from a user's inventory
+ ///
+ ///
+ ///
+ ///
+ void RezMultipleAttachmentsFromInventory(
+ IClientAPI remoteClient,
+ RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
+ RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
+
+ ///
/// Update the user inventory to the attachment of an item
///
///
--
cgit v1.1
From 57c293d604874c8033a602d1cea6f5250769ff14 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Fri, 16 Apr 2010 23:15:13 +0100
Subject: refactor: crudely move DetachSingleAttachmentToGround() over to the
AttachmentsModule
---
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 7 +++++++
1 file changed, 7 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index 77e9a7e..d43ce1f 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -92,6 +92,13 @@ namespace OpenSim.Region.Framework.Interfaces
IClientAPI remoteClient,
RezMultipleAttachmentsFromInvPacket.HeaderDataBlock header,
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
+
+ ///
+ /// Detach the given item to the ground.
+ ///
+ ///
+ ///
+ void DetachSingleAttachmentToGround(UUID itemID, IClientAPI remoteClient);
///
/// Update the user inventory to the attachment of an item
--
cgit v1.1
From 26e38842372e934937be36a21d8a99742cd485fe Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 17 Apr 2010 00:00:45 +0100
Subject: refactor: move DeatchObject() into the AttachmentsModule
---
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs | 10 ++++++++++
1 file changed, 10 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
index d43ce1f..f8af367 100644
--- a/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
+++ b/OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
@@ -94,6 +94,16 @@ namespace OpenSim.Region.Framework.Interfaces
RezMultipleAttachmentsFromInvPacket.ObjectDataBlock[] objects);
///
+ /// Detach an object from the avatar.
+ ///
+ ///
+ /// This method is called in response to a client's detach request, so we only update the information in
+ /// inventory
+ ///
+ ///
+ void DetachObject(uint objectLocalID, IClientAPI remoteClient);
+
+ ///
/// Detach the given item to the ground.
///
///
--
cgit v1.1
From 21cad5d3ac68ceb4ac48346835ac087ecb107446 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 19 Apr 2010 06:29:26 +0100
Subject: All scripts are now created suspended and are only unsuspended when
the object is fully rezzed and all scripts in it are instantiated. This
ensures that link messages will not be lost on rez/region crossing and makes
heavily scripted objects reliable.
---
OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 1 +
OpenSim/Region/Framework/Interfaces/IScriptModule.cs | 8 ++++++++
2 files changed, 9 insertions(+)
(limited to 'OpenSim/Region/Framework/Interfaces')
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
index f58904f..2b90960 100644
--- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
+++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs
@@ -74,6 +74,7 @@ namespace OpenSim.Region.Framework.Interfaces
void CreateScriptInstances(int startParam, bool postOnRez, string engine, int stateSource);
ArrayList GetScriptErrors(UUID itemID);
+ void ResumeScripts();
///
/// Stop all the scripts in this entity.
diff --git a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs b/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
index e90b300..fecdd1b 100644
--- a/OpenSim/Region/Framework/Interfaces/IScriptModule.cs
+++ b/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);
}
}
--
cgit v1.1