1 files changed, 22 insertions, 4 deletions

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);
     }