From a964bc3ca4d88cf9475f226eea73ae2741efd1a4 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 14 Sep 2009 18:31:34 +0100
Subject: Apply http://opensimulator.org/mantis/view.php?id=4142 Re-enable
XMLRPC scripting calls Moves XMLRPC scripting setup to a separate section
Thanks Fly-Man-
---
.../CoreModules/Scripting/XMLRPC/XMLRPCModule.cs | 2 +-
bin/OpenSim.ini.example | 24 ++++++++++++----------
2 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
index 059c006..8a169f8 100644
--- a/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
+++ b/OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs
@@ -110,7 +110,7 @@ namespace OpenSim.Region.CoreModules.Scripting.XMLRPC
try
{
- m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort);
+ m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort);
}
catch (Exception)
{
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a255260..8582a6c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -201,17 +201,6 @@
;MapImageModule = "MapImageModule"
; ##
- ; ## Scripting XMLRPC mapper
- ; ##
-
- ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
- ; script concurrently with the first remote_data event.
- ; This will contain the fully qualified URI an external site needs
- ; to use to send XMLRPC requests to that script
-
- ;XmlRpcRouterModule = "XmlRpcRouterModule"
-
- ; ##
; ## EMAIL MODULE
; ##
@@ -1421,3 +1410,16 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
[Modules]
Include-modules = "addon-modules/*/config/*.ini"
+
+[XMLRPC]
+ ; ##
+ ; ## Scripting XMLRPC mapper
+ ; ##
+
+ ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
+ ; script concurrently with the first remote_data event.
+ ; This will contain the fully qualified URI an external site needs
+ ; to use to send XMLRPC requests to that script
+
+ ;XmlRpcRouterModule = "XmlRpcRouterModule"
+ ;XmlRpcPort = 20800
--
cgit v1.1