diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 9079ca5f96..4d4a969f8c 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Interfaces
         void SendRegionHandshake(RegionInfo regionInfo);
         void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
         void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
-        void SendInstantMessage(string message, LLUUID target, string fromName, LLUUID id);
+        void SendInstantMessage(string message, LLUUID target, string fromName);
         void SendLayerData(float[] map);
         void SendLayerData(int px, int py, float[] map);
         void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 728329e4ef..67b4d8c6ae 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -115,11 +115,6 @@ namespace OpenSim
 
             m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
 
-            if (m_sandbox)
-            {
-                httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
-            }
-
             //Start http server
             m_log.Verbose("Main.cs:Startup() - Starting HTTP server");
             httpServer.Start();
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index a0478436cc..c47904de9f 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Region.Communications.Local
             UserServer = UserServices;
             GridServer = SandBoxServices;
             InterRegion = SandBoxServices;
+            httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);
         }
 
         internal void InformRegionOfLogin(ulong regionHandle, Login login)
diff --git a/prebuild.xml b/prebuild.xml
index 99a54f4c92..1366a0c020 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -574,6 +574,7 @@
       <Reference name="OpenSim.Framework.Servers"/>
       <Reference name="libsecondlife.dll"/>
       <Reference name="OpenSim.Framework"/>
+      <Reference name="XMLRPC.dll"/>
 
       <Files>
         <Match pattern="*.cs" recurse="true"/>