aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-06-15 00:59:53 +0100
committerJustin Clark-Casey (justincc)2012-06-15 00:59:53 +0100
commit10e87f9cdc6c2cbd01da863e01abca8f7e671f9c (patch)
tree25dcf24cdfcc20b7efc00ab4005648a215e3a9a3 /OpenSim
parentGet rid of some unnecessary null checks in RegionApplicationBase.StartupSpeci... (diff)
downloadopensim-SC_OLD-10e87f9cdc6c2cbd01da863e01abca8f7e671f9c.zip
opensim-SC_OLD-10e87f9cdc6c2cbd01da863e01abca8f7e671f9c.tar.gz
opensim-SC_OLD-10e87f9cdc6c2cbd01da863e01abca8f7e671f9c.tar.bz2
opensim-SC_OLD-10e87f9cdc6c2cbd01da863e01abca8f7e671f9c.tar.xz
Make XMLRPCModule use an existing HTTP server if one already exists on the desired port.
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs9
1 files changed, 5 insertions, 4 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 40ffcb4..0003af2 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -131,11 +131,12 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
131 { 131 {
132 // Start http server 132 // Start http server
133 // Attach xmlrpc handlers 133 // Attach xmlrpc handlers
134 m_log.Info("[XML RPC MODULE]: " + 134// m_log.InfoFormat(
135 "Starting up XMLRPC Server on port " + m_remoteDataPort + " for llRemoteData commands."); 135// "[XML RPC MODULE]: Starting up XMLRPC Server on port {0} for llRemoteData commands.",
136 BaseHttpServer httpServer = new BaseHttpServer((uint) m_remoteDataPort); 136// m_remoteDataPort);
137
138 IHttpServer httpServer = MainServer.GetHttpServer((uint)m_remoteDataPort);
137 httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData); 139 httpServer.AddXmlRPCHandler("llRemoteData", XmlRpcRemoteData);
138 httpServer.Start();
139 } 140 }
140 } 141 }
141 142