diff options
author | Dr Scofield | 2009-02-06 16:55:34 +0000 |
---|---|---|
committer | Dr Scofield | 2009-02-06 16:55:34 +0000 |
commit | 9b66108081a8c8cf79faaa6c541554091c40850e (patch) | |
tree | 095a232ae5a9de3a9244bcd34da08294f61eeea5 /OpenSim/Region/Environment/Interfaces | |
parent | * removed superfluous constants class (diff) | |
download | opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.zip opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.gz opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.bz2 opensim-SC_OLD-9b66108081a8c8cf79faaa6c541554091c40850e.tar.xz |
This changeset is the step 1 of 2 in refactoring
OpenSim.Region.Environment into a "framework" part and a modules only
part. This first changeset refactors OpenSim.Region.Environment.Scenes,
OpenSim.Region.Environment.Interfaces, and OpenSim.Region.Interfaces
into OpenSim.Region.Framework.{Interfaces,Scenes} leaving only region
modules in OpenSim.Region.Environment.
The next step will be to move region modules up from
OpenSim.Region.Environment.Modules to OpenSim.Region.CoreModules and
then sort out which modules are really core modules and which should
move out to forge.
I've been very careful to NOT BREAK anything. i hope i've
succeeded. as this is the work of a whole week i hope i managed to
keep track with the applied patches of the last week --- could any of
you that did check in stuff have a look at whether it survived? thx!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs (renamed from OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs) | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs (renamed from OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICommand.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommand.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICommandableModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommandableModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ICommander.cs (renamed from OpenSim/Region/Environment/Interfaces/ICommander.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDialogModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IDialogModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs (renamed from OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEmailModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IEmailModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityCreator.cs (renamed from OpenSim/Region/Environment/Interfaces/IEntityCreator.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs (renamed from OpenSim/Region/Environment/Interfaces/IEntityInventory.cs) | 7 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs (renamed from OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEstateModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IEstateModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IFriendsModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IFriendsModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IHttpRequests.cs (renamed from OpenSim/Region/Environment/Interfaces/IHttpRequests.cs) | 17 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInterregionComms.cs (renamed from OpenSim/Region/Environment/Interfaces/IInterregionComms.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs) | 5 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs (renamed from OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandChannel.cs (renamed from OpenSim/Region/Environment/Interfaces/ILandChannel.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ILandObject.cs (renamed from OpenSim/Region/Environment/Interfaces/ILandObject.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ISoundModule.cs (renamed from OpenSim/Region/Environment/Interfaces/ISoundModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrain.cs (renamed from OpenSim/Region/Environment/Interfaces/ITerrain.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs (renamed from OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/ITextureSender.cs (renamed from OpenSim/Region/Environment/Interfaces/ITextureSender.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IVegetationModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IVegetationModule.cs) | 4 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWindModule.cs (renamed from OpenSim/Region/Environment/Interfaces/IWindModule.cs) | 2 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IWorldComm.cs (renamed from OpenSim/Region/Environment/Interfaces/IWorldComm.cs) | 24 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IXMLRPC.cs (renamed from OpenSim/Region/Environment/Interfaces/IXMLRPC.cs) | 26 | ||||
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IXfer.cs (renamed from OpenSim/Region/Environment/Interfaces/IXfer.cs) | 2 |
33 files changed, 98 insertions, 56 deletions
diff --git a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs index 43c733d..49a5dd0 100644 --- a/OpenSim/Region/Environment/Interfaces/IAgentAssetTransactions.cs +++ b/OpenSim/Region/Framework/Interfaces/IAgentAssetTransactions.cs | |||
@@ -27,9 +27,10 @@ | |||
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | using OpenSim.Region.Framework.Scenes; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 34 | { |
34 | public interface IAgentAssetTransactions | 35 | public interface IAgentAssetTransactions |
35 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs index a722833..b533206 100644 --- a/OpenSim/Region/Environment/Interfaces/IAvatarFactory.cs +++ b/OpenSim/Region/Framework/Interfaces/IAvatarFactory.cs | |||
@@ -27,9 +27,9 @@ | |||
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Framework.Interfaces; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IAvatarFactory | 34 | public interface IAvatarFactory |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs index 8a2c549..bac0b2e 100644 --- a/OpenSim/Region/Environment/Interfaces/ICapabilitiesModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICapabilitiesModule.cs | |||
@@ -31,7 +31,7 @@ using OpenMetaverse; | |||
31 | using OpenSim.Framework; | 31 | using OpenSim.Framework; |
32 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; | 32 | using Caps = OpenSim.Framework.Communications.Capabilities.Caps; |
33 | 33 | ||
34 | namespace OpenSim.Region.Environment.Interfaces | 34 | namespace OpenSim.Region.Framework.Interfaces |
35 | { | 35 | { |
36 | public interface ICapabilitiesModule | 36 | public interface ICapabilitiesModule |
37 | { | 37 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ICommand.cs b/OpenSim/Region/Framework/Interfaces/ICommand.cs index c1da2c3..1551b58 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommand.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommand.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Interfaces | 30 | namespace OpenSim.Region.Framework.Interfaces |
31 | { | 31 | { |
32 | public enum CommandIntentions | 32 | public enum CommandIntentions |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs index c4ed942..5d6660d 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommandableModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommandableModule.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Environment.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface ICommandableModule | 30 | public interface ICommandableModule |
31 | { | 31 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ICommander.cs b/OpenSim/Region/Framework/Interfaces/ICommander.cs index a61ce490..17a2e4a 100644 --- a/OpenSim/Region/Environment/Interfaces/ICommander.cs +++ b/OpenSim/Region/Framework/Interfaces/ICommander.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Environment.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface ICommander | 30 | public interface ICommander |
31 | { | 31 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs index 755aa27..7247d52 100644 --- a/OpenSim/Region/Environment/Interfaces/IDialogModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IDialogModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IDialogModule | 34 | public interface IDialogModule |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs index c54c697..e119bc3 100644 --- a/OpenSim/Region/Environment/Interfaces/IDynamicTextureManager.cs +++ b/OpenSim/Region/Framework/Interfaces/IDynamicTextureManager.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using System.IO; | 28 | using System.IO; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IDynamicTextureManager | 33 | public interface IDynamicTextureManager |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs index 5f1bcf3..b5f885a 100644 --- a/OpenSim/Region/Environment/Interfaces/IEmailModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEmailModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public class Email | 34 | public class Email |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs index f45e959..1a6e626 100644 --- a/OpenSim/Region/Environment/Interfaces/IEntityCreator.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityCreator.cs | |||
@@ -27,9 +27,9 @@ | |||
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenSim.Region.Environment.Scenes; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | /// <summary> | 34 | /// <summary> |
35 | /// Interface to a class that is capable of creating entities | 35 | /// Interface to a class that is capable of creating entities |
diff --git a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index a270293..20fe090 100644 --- a/OpenSim/Region/Environment/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -32,11 +32,10 @@ using OpenMetaverse; | |||
32 | using log4net; | 32 | using log4net; |
33 | using OpenSim.Framework; | 33 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Communications.Cache; | 34 | using OpenSim.Framework.Communications.Cache; |
35 | using OpenSim.Region.Interfaces; | 35 | using OpenSim.Region.Framework.Interfaces; |
36 | using OpenSim.Region.Environment.Interfaces; | 36 | using OpenSim.Region.Framework.Scenes.Scripting; |
37 | using OpenSim.Region.Environment.Scenes.Scripting; | ||
38 | 37 | ||
39 | namespace OpenSim.Region.Environment.Scenes | 38 | namespace OpenSim.Region.Framework.Interfaces |
40 | { | 39 | { |
41 | /// <summary> | 40 | /// <summary> |
42 | /// Interface to an entity's (SceneObjectPart's) inventory | 41 | /// Interface to an entity's (SceneObjectPart's) inventory |
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs index f2d14a6..4da115e 100644 --- a/OpenSim/Region/Environment/Interfaces/IEstateDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateDataStore.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IEstateDataStore | 34 | public interface IEstateDataStore |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs index d84af20..f169f61 100644 --- a/OpenSim/Region/Environment/Interfaces/IEstateModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IEstateModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IEstateModule : IRegionModule | 34 | public interface IEstateModule : IRegionModule |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs index 5d3376c..0bdfb8f 100644 --- a/OpenSim/Region/Environment/Interfaces/IFriendsModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IFriendsModule.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IFriendsModule | 33 | public interface IFriendsModule |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs index 216782b..fd49757 100644 --- a/OpenSim/Region/Environment/Interfaces/IHttpRequests.cs +++ b/OpenSim/Region/Framework/Interfaces/IHttpRequests.cs | |||
@@ -25,18 +25,27 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | using System; | ||
28 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Net; | ||
29 | using OpenMetaverse; | 31 | using OpenMetaverse; |
30 | using OpenSim.Region.Environment.Modules.Scripting.HttpRequest; | ||
31 | 32 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 34 | { |
34 | public interface IHttpRequests | 35 | public enum HttpRequestConstants |
36 | { | ||
37 | HTTP_METHOD = 0, | ||
38 | HTTP_MIMETYPE = 1, | ||
39 | HTTP_BODY_MAXLENGTH = 2, | ||
40 | HTTP_VERIFY_CERT = 3, | ||
41 | } | ||
42 | |||
43 | public interface IHttpRequestModule | ||
35 | { | 44 | { |
36 | UUID MakeHttpRequest(string url, string parameters, string body); | 45 | UUID MakeHttpRequest(string url, string parameters, string body); |
37 | UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body); | 46 | UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body); |
38 | void StopHttpRequest(uint m_localID, UUID m_itemID); | 47 | void StopHttpRequest(uint m_localID, UUID m_itemID); |
39 | HttpRequestClass GetNextCompletedRequest(); | 48 | IServiceRequest GetNextCompletedRequest(); |
40 | void RemoveCompletedRequest(UUID id); | 49 | void RemoveCompletedRequest(UUID id); |
41 | } | 50 | } |
42 | } | 51 | } |
diff --git a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs index 7aeef15..783b3f9 100644 --- a/OpenSim/Region/Environment/Interfaces/IInterregionComms.cs +++ b/OpenSim/Region/Framework/Interfaces/IInterregionComms.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public delegate bool ChildAgentUpdateReceived(AgentData data); | 34 | public delegate bool ChildAgentUpdateReceived(AgentData data); |
35 | 35 | ||
diff --git a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs index ee170b9..4314271 100644 --- a/OpenSim/Region/Environment/Interfaces/IInventoryTransferModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IInventoryTransferModule.cs | |||
@@ -27,10 +27,9 @@ | |||
27 | 27 | ||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Region.Environment; | 30 | using OpenSim.Region.Framework.Scenes; |
31 | using OpenSim.Region.Environment.Scenes; | ||
32 | 31 | ||
33 | namespace OpenSim.Framework | 32 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 33 | { |
35 | /// <summary> | 34 | /// <summary> |
36 | /// An interface for a module that manages inter-agent inventory offers and transfers. | 35 | /// An interface for a module that manages inter-agent inventory offers and transfers. |
diff --git a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs index 2a37195..1d10896 100644 --- a/OpenSim/Region/Environment/Interfaces/IJ2KDecoder.cs +++ b/OpenSim/Region/Framework/Interfaces/IJ2KDecoder.cs | |||
@@ -28,7 +28,7 @@ | |||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenMetaverse.Imaging; | 29 | using OpenMetaverse.Imaging; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | 33 | ||
34 | public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); | 34 | public delegate void DecodedCallback(UUID AssetId, OpenJPEG.J2KLayerInfo[] layers); |
diff --git a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs index a8a58ef..35c2fc1 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandChannel.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Framework.Interfaces; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public interface ILandChannel | 35 | public interface ILandChannel |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ILandObject.cs b/OpenSim/Region/Framework/Interfaces/ILandObject.cs index 6fcf74b..52cc6cf 100644 --- a/OpenSim/Region/Environment/Interfaces/ILandObject.cs +++ b/OpenSim/Region/Framework/Interfaces/ILandObject.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj); | 35 | public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj); |
36 | public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj); | 36 | public delegate int overrideSimulatorMaxPrimCountDelegate(ILandObject obj); |
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs index 559d2a6..97afe8d 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionArchiverModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionArchiverModule.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using System.IO; | 28 | using System.IO; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Interfaces | 30 | namespace OpenSim.Region.Framework.Interfaces |
31 | { | 31 | { |
32 | /// <summary> | 32 | /// <summary> |
33 | /// Interface to region archive functionality | 33 | /// Interface to region archive functionality |
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs index 78fc626..46d81ce 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionDataStore.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionDataStore.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using System.Collections.Generic; | 28 | using System.Collections.Generic; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public interface IRegionDataStore | 35 | public interface IRegionDataStore |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs index ffa4f32..6a45017 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionModule.cs | |||
@@ -26,9 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using Nini.Config; | 28 | using Nini.Config; |
29 | using OpenSim.Region.Environment.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IRegionModule | 33 | public interface IRegionModule |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs index b89f869..40e4c99 100644 --- a/OpenSim/Region/Environment/Interfaces/IRegionSerialiserModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IRegionSerialiserModule.cs | |||
@@ -28,9 +28,9 @@ | |||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.IO; | 30 | using System.IO; |
31 | using OpenSim.Region.Environment.Scenes; | 31 | using OpenSim.Region.Framework.Scenes; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public interface IRegionSerialiserModule | 35 | public interface IRegionSerialiserModule |
36 | { | 36 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs index 3bb4c57..91c80e3 100644 --- a/OpenSim/Region/Environment/Interfaces/ISoundModule.cs +++ b/OpenSim/Region/Framework/Interfaces/ISoundModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using Nini.Config; | 29 | using Nini.Config; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface ISoundModule | 34 | public interface ISoundModule |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrain.cs b/OpenSim/Region/Framework/Interfaces/ITerrain.cs index d5e1540..6e9c98d 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrain.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrain.cs | |||
@@ -27,7 +27,7 @@ | |||
27 | 27 | ||
28 | using OpenSim.Framework; | 28 | using OpenSim.Framework; |
29 | 29 | ||
30 | namespace OpenSim.Region.Environment.Interfaces | 30 | namespace OpenSim.Region.Framework.Interfaces |
31 | { | 31 | { |
32 | public interface ITerrain | 32 | public interface ITerrain |
33 | { | 33 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs index 4bcb14b..fc4ced2 100644 --- a/OpenSim/Region/Environment/Interfaces/ITerrainChannel.cs +++ b/OpenSim/Region/Framework/Interfaces/ITerrainChannel.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Environment.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface ITerrainChannel | 30 | public interface ITerrainChannel |
31 | { | 31 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs index ece1953..aab3d26 100644 --- a/OpenSim/Region/Environment/Interfaces/ITextureSender.cs +++ b/OpenSim/Region/Framework/Interfaces/ITextureSender.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Environment.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | /// <summary> | 30 | /// <summary> |
31 | /// Interface for an object which can send texture information to a client | 31 | /// Interface for an object which can send texture information to a client |
diff --git a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs index c411993..537a8dc 100644 --- a/OpenSim/Region/Environment/Interfaces/IVegetationModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IVegetationModule.cs | |||
@@ -26,9 +26,9 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Region.Environment.Scenes; | 29 | using OpenSim.Region.Framework.Scenes; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | namespace OpenSim.Region.Framework.Interfaces |
32 | { | 32 | { |
33 | public interface IVegetationModule : IEntityCreator | 33 | public interface IVegetationModule : IEntityCreator |
34 | { | 34 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IWindModule.cs b/OpenSim/Region/Framework/Interfaces/IWindModule.cs index 9896c56..96b303f 100644 --- a/OpenSim/Region/Environment/Interfaces/IWindModule.cs +++ b/OpenSim/Region/Framework/Interfaces/IWindModule.cs | |||
@@ -29,7 +29,7 @@ using System; | |||
29 | using OpenSim.Framework; | 29 | using OpenSim.Framework; |
30 | using OpenMetaverse; | 30 | using OpenMetaverse; |
31 | 31 | ||
32 | namespace OpenSim.Region.Environment.Interfaces | 32 | namespace OpenSim.Region.Framework.Interfaces |
33 | { | 33 | { |
34 | public interface IWindModule : IRegionModule | 34 | public interface IWindModule : IRegionModule |
35 | { | 35 | { |
diff --git a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs index 1a33450..24865db 100644 --- a/OpenSim/Region/Environment/Interfaces/IWorldComm.cs +++ b/OpenSim/Region/Framework/Interfaces/IWorldComm.cs | |||
@@ -28,21 +28,37 @@ | |||
28 | using System; | 28 | using System; |
29 | using OpenMetaverse; | 29 | using OpenMetaverse; |
30 | using OpenSim.Framework; | 30 | using OpenSim.Framework; |
31 | using OpenSim.Region.Environment.Modules.Scripting.WorldComm; | 31 | // using OpenSim.Region.Environment.Modules.Scripting.WorldComm; |
32 | 32 | ||
33 | namespace OpenSim.Region.Environment.Interfaces | 33 | namespace OpenSim.Region.Framework.Interfaces |
34 | { | 34 | { |
35 | public interface IWorldCommListenerInfo | ||
36 | { | ||
37 | Object[] GetSerializationData(); | ||
38 | UUID GetItemID(); | ||
39 | UUID GetHostID(); | ||
40 | int GetChannel(); | ||
41 | uint GetLocalID(); | ||
42 | int GetHandle(); | ||
43 | string GetMessage(); | ||
44 | string GetName(); | ||
45 | bool IsActive(); | ||
46 | void Deactivate(); | ||
47 | void Activate(); | ||
48 | UUID GetID(); | ||
49 | } | ||
50 | |||
35 | public interface IWorldComm | 51 | public interface IWorldComm |
36 | { | 52 | { |
37 | int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg); | 53 | int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg); |
38 | void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg); | 54 | void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg); |
39 | bool HasMessages(); | 55 | bool HasMessages(); |
40 | ListenerInfo GetNextMessage(); | 56 | IWorldCommListenerInfo GetNextMessage(); |
41 | void ListenControl(UUID itemID, int handle, int active); | 57 | void ListenControl(UUID itemID, int handle, int active); |
42 | void ListenRemove(UUID itemID, int handle); | 58 | void ListenRemove(UUID itemID, int handle); |
43 | void DeleteListener(UUID itemID); | 59 | void DeleteListener(UUID itemID); |
44 | Object[] GetSerializationData(UUID itemID); | 60 | Object[] GetSerializationData(UUID itemID); |
45 | void CreateFromData(uint localID, UUID itemID, UUID hostID, | 61 | void CreateFromData(uint localID, UUID itemID, UUID hostID, |
46 | Object[] data); | 62 | Object[] data); |
47 | } | 63 | } |
48 | } | 64 | } |
diff --git a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs index 88e9ab5..6570b0a 100644 --- a/OpenSim/Region/Environment/Interfaces/IXMLRPC.cs +++ b/OpenSim/Region/Framework/Interfaces/IXMLRPC.cs | |||
@@ -26,10 +26,28 @@ | |||
26 | */ | 26 | */ |
27 | 27 | ||
28 | using OpenMetaverse; | 28 | using OpenMetaverse; |
29 | using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; | 29 | using Nwc.XmlRpc; |
30 | 30 | ||
31 | namespace OpenSim.Region.Environment.Interfaces | 31 | // using OpenSim.Region.Environment.Modules.Scripting.XMLRPC; |
32 | |||
33 | namespace OpenSim.Region.Framework.Interfaces | ||
32 | { | 34 | { |
35 | public interface IXmlRpcRequestInfo | ||
36 | { | ||
37 | bool IsProcessed(); | ||
38 | UUID GetChannelKey(); | ||
39 | void SetProcessed(bool processed); | ||
40 | void SetStrRetval(string resp); | ||
41 | string GetStrRetval(); | ||
42 | void SetIntRetval(int resp); | ||
43 | int GetIntRetval(); | ||
44 | uint GetLocalID(); | ||
45 | UUID GetItemID(); | ||
46 | string GetStrVal(); | ||
47 | int GetIntValue(); | ||
48 | UUID GetMessageID(); | ||
49 | } | ||
50 | |||
33 | public interface IXMLRPC | 51 | public interface IXMLRPC |
34 | { | 52 | { |
35 | UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID); | 53 | UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID); |
@@ -37,11 +55,11 @@ namespace OpenSim.Region.Environment.Interfaces | |||
37 | bool hasRequests(); | 55 | bool hasRequests(); |
38 | void RemoteDataReply(string channel, string message_id, string sdata, int idata); | 56 | void RemoteDataReply(string channel, string message_id, string sdata, int idata); |
39 | bool IsEnabled(); | 57 | bool IsEnabled(); |
40 | RPCRequestInfo GetNextCompletedRequest(); | 58 | IXmlRpcRequestInfo GetNextCompletedRequest(); |
41 | void RemoveCompletedRequest(UUID id); | 59 | void RemoveCompletedRequest(UUID id); |
42 | void DeleteChannels(UUID itemID); | 60 | void DeleteChannels(UUID itemID); |
43 | UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata); | 61 | UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata); |
44 | SendRemoteDataRequest GetNextCompletedSRDRequest(); | 62 | IServiceRequest GetNextCompletedSRDRequest(); |
45 | void RemoveCompletedSRDRequest(UUID id); | 63 | void RemoveCompletedSRDRequest(UUID id); |
46 | void CancelSRDRequests(UUID itemID); | 64 | void CancelSRDRequests(UUID itemID); |
47 | } | 65 | } |
diff --git a/OpenSim/Region/Environment/Interfaces/IXfer.cs b/OpenSim/Region/Framework/Interfaces/IXfer.cs index bad1833..a83f166 100644 --- a/OpenSim/Region/Environment/Interfaces/IXfer.cs +++ b/OpenSim/Region/Framework/Interfaces/IXfer.cs | |||
@@ -25,7 +25,7 @@ | |||
25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 25 | * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
26 | */ | 26 | */ |
27 | 27 | ||
28 | namespace OpenSim.Region.Environment.Interfaces | 28 | namespace OpenSim.Region.Framework.Interfaces |
29 | { | 29 | { |
30 | public interface IXfer | 30 | public interface IXfer |
31 | { | 31 | { |