From 9588328242f4004446b5cc08251995b8d004b4f2 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 2 Feb 2013 00:59:26 +0000
Subject: Stop exceptions being thrown if GenerateMapTiles = false but no
 static map tile has been set.  Do more informative warn instead.

---
 bin/OpenSimDefaults.ini | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index c60579b..6ebdb96 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,6 +1,20 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
+[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
+
 
 [Startup]
     ; Console prompt
-- 
cgit v1.1


From 80d9b336ff996741022ce9b1e7c95a650d15c465 Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Mon, 4 Feb 2013 07:07:36 +0000
Subject: Remove [XMLRPC] section I added by accident to the top of
 OpenSimDefaults.ini in previous commit 95883282

---
 bin/OpenSimDefaults.ini | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'bin/OpenSimDefaults.ini')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6ebdb96..9119273 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1,21 +1,6 @@
 ; This file contains defaults for various settings in OpenSimulator.  These can be overriden
 ; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
 
-[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
-
-
 [Startup]
     ; Console prompt
     ; Certain special characters can be used to customize the prompt
-- 
cgit v1.1