Merge branch 'master' into careminster

2 files changed, 22 insertions, 15 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b21a214..6757081 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -439,9 +439,30 @@
     ;; What is reported as the "User-Agent" when using llHTTPRequest
     ;; Defaults to not sent if not set here. See the notes section in the wiki
     ;; at http://wiki.secondlife.com/wiki/LlHTTPRequest for comments on adding
-    ;; " (Mozilla Compatible)" to the text where there are problems with a web server
+    ;; " (Mozilla Compatible)" to the text where there are problems with a 
+    ;; web server
     ; user_agent = "OpenSim LSL (Mozilla Compatible)"
 
+[XMLRPC]
+    ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
+    ;; If enabled and set to XmlRpcRouterModule, 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
+    ;;
+    ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
+    ;; will be registered with an external service via a configured uri
+    ;XmlRpcRouterModule = "XmlRpcRouterModule"
+
+    ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
+    ;XmlRpcPort = 20800
+
+    ;# {XmlRpcHubURI} {XmlRpcRouterModule} {URI for external service used to register xmlrpc channels created in the simulator. This depends on XmlRpcRouterModule being set to XmlRpcGridRouterModule} http://example.com
+    ;; If XmlRpcRouterModule is set to XmlRpcGridRouterModule, the simulator
+    ;; will use this address to register xmlrpc channels on the external
+    ;; service 
+    ; XmlRpcHubURI = http://example.com
+
 
 [ClientStack.LindenUDP]
     ;; See OpensSimDefaults.ini for the throttle options. You can copy the
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 16cde7e..01ba5b9 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -425,20 +425,6 @@
     ; many simultaneous requests, default is 30 and is currently applied only to assets
     ;MaxRequestConcurrency = 30
 
-[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
-
-
 [ClientStack.LindenUDP]
     ; Set this to true to process incoming packets asynchronously. Networking is
     ; already separated from packet handling with a queue, so this will only