Next time maybe I should check it still compiles before committing.
parent
20a77a6d4b
commit
7198d7980d
|
@ -154,7 +154,7 @@ namespace OpenSim.Framework.Interfaces
|
||||||
void SendRegionHandshake(RegionInfo regionInfo);
|
void SendRegionHandshake(RegionInfo regionInfo);
|
||||||
void SendChatMessage(string message, byte type, LLVector3 fromPos, string fromName, LLUUID fromAgentID);
|
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 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(float[] map);
|
||||||
void SendLayerData(int px, int py, float[] map);
|
void SendLayerData(int px, int py, float[] map);
|
||||||
void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
|
void MoveAgentIntoRegion(RegionInfo regInfo, LLVector3 pos, LLVector3 look);
|
||||||
|
|
|
@ -115,11 +115,6 @@ namespace OpenSim
|
||||||
|
|
||||||
m_log.Verbose("Main.cs:Startup() - Initialising HTTP server");
|
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
|
//Start http server
|
||||||
m_log.Verbose("Main.cs:Startup() - Starting HTTP server");
|
m_log.Verbose("Main.cs:Startup() - Starting HTTP server");
|
||||||
httpServer.Start();
|
httpServer.Start();
|
||||||
|
|
|
@ -44,6 +44,7 @@ namespace OpenSim.Region.Communications.Local
|
||||||
UserServer = UserServices;
|
UserServer = UserServices;
|
||||||
GridServer = SandBoxServices;
|
GridServer = SandBoxServices;
|
||||||
InterRegion = SandBoxServices;
|
InterRegion = SandBoxServices;
|
||||||
|
httpServer.AddXmlRPCHandler("login_to_simulator", UserServices.XmlRpcLoginMethod);
|
||||||
}
|
}
|
||||||
|
|
||||||
internal void InformRegionOfLogin(ulong regionHandle, Login login)
|
internal void InformRegionOfLogin(ulong regionHandle, Login login)
|
||||||
|
|
|
@ -574,6 +574,7 @@
|
||||||
<Reference name="OpenSim.Framework.Servers"/>
|
<Reference name="OpenSim.Framework.Servers"/>
|
||||||
<Reference name="libsecondlife.dll"/>
|
<Reference name="libsecondlife.dll"/>
|
||||||
<Reference name="OpenSim.Framework"/>
|
<Reference name="OpenSim.Framework"/>
|
||||||
|
<Reference name="XMLRPC.dll"/>
|
||||||
|
|
||||||
<Files>
|
<Files>
|
||||||
<Match pattern="*.cs" recurse="true"/>
|
<Match pattern="*.cs" recurse="true"/>
|
||||||
|
|
Loading…
Reference in New Issue