aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-09-14 18:31:34 +0100
committerJustin Clark-Casey (justincc)2009-09-14 18:31:34 +0100
commita964bc3ca4d88cf9475f226eea73ae2741efd1a4 (patch)
tree64b6e4b77210cab4dc427d6a970b2c72c262eb22
parentMerge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-a964bc3ca4d88cf9475f226eea73ae2741efd1a4.zip
opensim-SC_OLD-a964bc3ca4d88cf9475f226eea73ae2741efd1a4.tar.gz
opensim-SC_OLD-a964bc3ca4d88cf9475f226eea73ae2741efd1a4.tar.bz2
opensim-SC_OLD-a964bc3ca4d88cf9475f226eea73ae2741efd1a4.tar.xz
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-
-rw-r--r--OpenSim/Region/CoreModules/Scripting/XMLRPC/XMLRPCModule.cs2
-rw-r--r--bin/OpenSim.ini.example24
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
110 110
111 try 111 try
112 { 112 {
113 m_remoteDataPort = config.Configs["Network"].GetInt("remoteDataPort", m_remoteDataPort); 113 m_remoteDataPort = config.Configs["XMLRPC"].GetInt("XmlRpcPort", m_remoteDataPort);
114 } 114 }
115 catch (Exception) 115 catch (Exception)
116 { 116 {
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 @@
201 ;MapImageModule = "MapImageModule" 201 ;MapImageModule = "MapImageModule"
202 202
203 ; ## 203 ; ##
204 ; ## Scripting XMLRPC mapper
205 ; ##
206
207 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
208 ; script concurrently with the first remote_data event.
209 ; This will contain the fully qualified URI an external site needs
210 ; to use to send XMLRPC requests to that script
211
212 ;XmlRpcRouterModule = "XmlRpcRouterModule"
213
214 ; ##
215 ; ## EMAIL MODULE 204 ; ## EMAIL MODULE
216 ; ## 205 ; ##
217 206
@@ -1421,3 +1410,16 @@
1421 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; 1410 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
1422[Modules] 1411[Modules]
1423 Include-modules = "addon-modules/*/config/*.ini" 1412 Include-modules = "addon-modules/*/config/*.ini"
1413
1414[XMLRPC]
1415 ; ##
1416 ; ## Scripting XMLRPC mapper
1417 ; ##
1418
1419 ; If enabled, this will post an event, "xmlrpc_uri(string)" to the
1420 ; script concurrently with the first remote_data event.
1421 ; This will contain the fully qualified URI an external site needs
1422 ; to use to send XMLRPC requests to that script
1423
1424 ;XmlRpcRouterModule = "XmlRpcRouterModule"
1425 ;XmlRpcPort = 20800