aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMW2007-07-12 15:30:09 +0000
committerMW2007-07-12 15:30:09 +0000
commit7198d7980d54c130e720c3fd5049e5525a1480e4 (patch)
tree4d76c1a8453948c6df92e846cc4fa37ad368faa2
parentFixed a number of bugs in the local InstantMessage handling, sending InstantM... (diff)
downloadopensim-SC_OLD-7198d7980d54c130e720c3fd5049e5525a1480e4.zip
opensim-SC_OLD-7198d7980d54c130e720c3fd5049e5525a1480e4.tar.gz
opensim-SC_OLD-7198d7980d54c130e720c3fd5049e5525a1480e4.tar.bz2
opensim-SC_OLD-7198d7980d54c130e720c3fd5049e5525a1480e4.tar.xz
Next time maybe I should check it still compiles before committing.
-rw-r--r--OpenSim/Framework/General/Interfaces/IClientAPI.cs2
-rw-r--r--OpenSim/Region/Application/OpenSimMain.cs5
-rw-r--r--OpenSim/Region/Communications/Local/CommunicationsLocal.cs1
-rw-r--r--prebuild.xml1
4 files changed, 3 insertions, 6 deletions
diff --git a/OpenSim/Framework/General/Interfaces/IClientAPI.cs b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
index 9079ca5..4d4a969 100644
--- a/OpenSim/Framework/General/Interfaces/IClientAPI.cs
+++ b/OpenSim/Framework/General/Interfaces/IClientAPI.cs
@@ -154,7 +154,7 @@ namespace OpenSim.Framework.Interfaces
154 void SendRegionHandshake(RegionInfo regionInfo); 154 void SendRegionHandshake(RegionInfo regionInfo);
155 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 155 void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
156 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID); 156 void SendChatMessage(byte[] message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
157 void SendInstantMessage(string message, LLUUID target, string fromName, LLUUID id); 157 void SendInstantMessage(string message, LLUUID target, string fromName);
158 void SendLayerData(float[] map); 158 void SendLayerData(float[] map);
159 void SendLayerData(int px, int py, float[] map); 159 void SendLayerData(int px, int py, float[] map);
160 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look); 160 void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
diff --git a/OpenSim/Region/Application/OpenSimMain.cs b/OpenSim/Region/Application/OpenSimMain.cs
index 728329e..67b4d8c 100644
--- a/OpenSim/Region/Application/OpenSimMain.cs
+++ b/OpenSim/Region/Application/OpenSimMain.cs
@@ -115,11 +115,6 @@ namespace OpenSim
115 115
116 m_log.Verbose("Main.cs:Startup() - Initialising HTTP server"); 116 m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
117 117
118 if (m_sandbox)
119 {
120 httpServer.AddXmlRPCHandler("login_to_simulator", ((CommunicationsLocal)this.commsManager).UserServices.XmlRpcLoginMethod);
121 }
122
123 //Start http server 118 //Start http server
124 m_log.Verbose("Main.cs:Startup() - Starting HTTP server"); 119 m_log.Verbose("Main.cs:Startup() - Starting HTTP server");
125 httpServer.Start(); 120 httpServer.Start();
diff --git a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
index a047843..c47904d 100644
--- a/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
+++ b/OpenSim/Region/Communications/Local/CommunicationsLocal.cs
@@ -44,6 +44,7 @@ namespace OpenSim.Region.Communications.Local
44 UserServer = UserServices; 44 UserServer = UserServices;
45 GridServer = SandBoxServices; 45 GridServer = SandBoxServices;
46 InterRegion = SandBoxServices; 46 InterRegion = SandBoxServices;
47 httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);
47 } 48 }
48 49
49 internal void InformRegionOfLogin(ulong regionHandle, Login login) 50 internal void InformRegionOfLogin(ulong regionHandle, Login login)
diff --git a/prebuild.xml b/prebuild.xml
index 99a54f4..1366a0c 100644
--- a/prebuild.xml
+++ b/prebuild.xml
@@ -574,6 +574,7 @@
574 <Reference name="OpenSim.Framework.Servers"/> 574 <Reference name="OpenSim.Framework.Servers"/>
575 <Reference name="libsecondlife.dll"/> 575 <Reference name="libsecondlife.dll"/>
576 <Reference name="OpenSim.Framework"/> 576 <Reference name="OpenSim.Framework"/>
577 <Reference name="XMLRPC.dll"/>
577 578
578 <Files> 579 <Files>
579 <Match pattern="*.cs" recurse="true"/> 580 <Match pattern="*.cs" recurse="true"/>