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 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IAgentAssetTransactions
     {
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 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IAvatarFactory
     {
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;
 using OpenSim.Framework;
 using Caps = OpenSim.Framework.Communications.Capabilities.Caps;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICapabilitiesModule
     {
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 @@
 
 using System.Collections.Generic;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public enum CommandIntentions
     {
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICommandableModule
     {
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ICommander
     {
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;
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IDialogModule
     {
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 @@
 using System.IO;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IDynamicTextureManager
     {
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;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public class Email
     {
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 @@
 
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces    
+namespace OpenSim.Region.Framework.Interfaces    
 {
     /// <summary>
     /// 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;
 using log4net;
 using OpenSim.Framework;
 using OpenSim.Framework.Communications.Cache;
-using OpenSim.Region.Interfaces;
-using OpenSim.Region.Environment.Interfaces;
-using OpenSim.Region.Environment.Scenes.Scripting;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes.Scripting;
 
-namespace OpenSim.Region.Environment.Scenes
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// 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;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEstateDataStore
     {
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;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IEstateModule : IRegionModule
     {
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 @@
 using OpenMetaverse;
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {       
     public interface IFriendsModule
     {
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
 using System.Collections.Generic;
+using System.Net;
 using OpenMetaverse;
-using OpenSim.Region.Environment.Modules.Scripting.HttpRequest;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
-    public interface IHttpRequests
+    public enum HttpRequestConstants
+    {
+        HTTP_METHOD = 0,
+        HTTP_MIMETYPE = 1,
+        HTTP_BODY_MAXLENGTH = 2,
+        HTTP_VERIFY_CERT = 3,
+    }
+
+    public interface IHttpRequestModule
     {
         UUID MakeHttpRequest(string url, string parameters, string body);
         UUID StartHttpRequest(uint localID, UUID itemID, string url, List<string> parameters, Dictionary<string, string> headers, string body);
         void StopHttpRequest(uint m_localID, UUID m_itemID);
-        HttpRequestClass GetNextCompletedRequest();
+        IServiceRequest GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
     }
 }
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;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate bool ChildAgentUpdateReceived(AgentData data);
 
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 @@
 
 using System.Collections.Generic;
 using OpenMetaverse;
-using OpenSim.Region.Environment;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Framework
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// 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 @@
 using OpenMetaverse;
 using OpenMetaverse.Imaging;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     
     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 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Interfaces;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ILandChannel
     {
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 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public delegate int overrideParcelMaxPrimCountDelegate(ILandObject obj);
     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 @@
 
 using System.IO;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// 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 @@
 using System.Collections.Generic;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionDataStore
     {
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 @@
  */
 
 using Nini.Config;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionModule
     {
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 @@
 using OpenMetaverse;
 using System.Collections.Generic;
 using System.IO;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IRegionSerialiserModule
     {
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;
 using Nini.Config;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment
+namespace OpenSim.Region.Framework.Interfaces
 {       
     public interface ISoundModule
     {
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 @@
 
 using OpenSim.Framework;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ITerrain
     {
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface ITerrainChannel
     {
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     /// <summary>
     /// 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 @@
  */
 
 using OpenMetaverse;
-using OpenSim.Region.Environment.Scenes;
+using OpenSim.Region.Framework.Scenes;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {        
     public interface IVegetationModule : IEntityCreator
     {
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;
 using OpenSim.Framework;
 using OpenMetaverse;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IWindModule : IRegionModule
     {
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 @@
 using System;
 using OpenMetaverse;
 using OpenSim.Framework;
-using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
+// using OpenSim.Region.Environment.Modules.Scripting.WorldComm;
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
+    public interface IWorldCommListenerInfo
+    {
+        Object[] GetSerializationData();
+        UUID GetItemID();
+        UUID GetHostID();
+        int GetChannel();
+        uint GetLocalID();
+        int GetHandle();
+        string GetMessage();
+        string GetName();
+        bool IsActive();
+        void Deactivate();
+        void Activate();
+        UUID GetID();
+    }
+
     public interface IWorldComm
     {
         int Listen(uint LocalID, UUID itemID, UUID hostID, int channel, string name, UUID id, string msg);
         void DeliverMessage(ChatTypeEnum type, int channel, string name, UUID id, string msg);
         bool HasMessages();
-        ListenerInfo GetNextMessage();
+        IWorldCommListenerInfo GetNextMessage();
         void ListenControl(UUID itemID, int handle, int active);
         void ListenRemove(UUID itemID, int handle);
         void DeleteListener(UUID itemID);
         Object[] GetSerializationData(UUID itemID);
         void CreateFromData(uint localID, UUID itemID, UUID hostID,
-                        Object[] data);
+                            Object[] data);
     }
 }
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 @@
  */
 
 using OpenMetaverse;
-using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+using Nwc.XmlRpc;
 
-namespace OpenSim.Region.Environment.Interfaces
+// using OpenSim.Region.Environment.Modules.Scripting.XMLRPC;
+
+namespace OpenSim.Region.Framework.Interfaces
 {
+    public interface IXmlRpcRequestInfo
+    {
+        bool IsProcessed();
+        UUID GetChannelKey();
+        void SetProcessed(bool processed);
+        void SetStrRetval(string resp);
+        string GetStrRetval();
+        void SetIntRetval(int resp);
+        int GetIntRetval();
+        uint GetLocalID();
+        UUID GetItemID();
+        string GetStrVal();
+        int GetIntValue();
+        UUID GetMessageID();
+    }
+
     public interface IXMLRPC
     {
         UUID OpenXMLRPCChannel(uint localID, UUID itemID, UUID channelID);
@@ -37,11 +55,11 @@ namespace OpenSim.Region.Environment.Interfaces
         bool hasRequests();
         void RemoteDataReply(string channel, string message_id, string sdata, int idata);
         bool IsEnabled();
-        RPCRequestInfo GetNextCompletedRequest();
+        IXmlRpcRequestInfo GetNextCompletedRequest();
         void RemoveCompletedRequest(UUID id);
         void DeleteChannels(UUID itemID);
         UUID SendRemoteData(uint localID, UUID itemID, string channel, string dest, int idata, string sdata);
-        SendRemoteDataRequest GetNextCompletedSRDRequest();
+        IServiceRequest GetNextCompletedSRDRequest();
         void RemoveCompletedSRDRequest(UUID id);
         void CancelSRDRequests(UUID itemID);
     }
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 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-namespace OpenSim.Region.Environment.Interfaces
+namespace OpenSim.Region.Framework.Interfaces
 {
     public interface IXfer
     {