aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-02-02 00:59:26 +0000
committerJustin Clark-Casey (justincc)2013-02-02 00:59:26 +0000
commit9588328242f4004446b5cc08251995b8d004b4f2 (patch)
tree3ee046d444d9c883183c3e54bfeb2f53fdd06617 /bin
parentSit and Spin reduction. If sitting, slam avatar angular velocity to zero. (diff)
downloadopensim-SC_OLD-9588328242f4004446b5cc08251995b8d004b4f2.zip
opensim-SC_OLD-9588328242f4004446b5cc08251995b8d004b4f2.tar.gz
opensim-SC_OLD-9588328242f4004446b5cc08251995b8d004b4f2.tar.bz2
opensim-SC_OLD-9588328242f4004446b5cc08251995b8d004b4f2.tar.xz
Stop exceptions being thrown if GenerateMapTiles = false but no static map tile has been set. Do more informative warn instead.
Diffstat (limited to 'bin')
-rw-r--r--bin/OpenSim.ini.example7
-rw-r--r--bin/OpenSimDefaults.ini14
2 files changed, 18 insertions, 3 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 0fe44e9..653de5c 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -269,9 +269,10 @@
269 ; DefaultScriptEngine = "XEngine" 269 ; DefaultScriptEngine = "XEngine"
270 270
271 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true 271 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
272 ;; Map tile options. You can choose to generate no map tiles at all, 272 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
273 ;; generate normal maptiles, or nominate an uploaded texture to 273 ;; be the map tile using the MaptileStaticUUID parameter in this section or for individual regions in
274 ;; be the map tile 274 ;; the regions config file(s). If you do not want to upload map tiles at all, then you will need
275 ;; to disable the MapImageServiceModule entirely.
275 ; GenerateMaptiles = true 276 ; GenerateMaptiles = true
276 277
277 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0 278 ;# {MaptileRefresh} {GenerateMaptiles} {Maptile refresh period?} {} 0
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 @@
1; This file contains defaults for various settings in OpenSimulator. These can be overriden 1; This file contains defaults for various settings in OpenSimulator. These can be overriden
2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini). 2; by changing the same setting in OpenSim.ini (once OpenSim.ini.example has been copied to OpenSim.ini).
3 3
4[XMLRPC]
5 ;# {XmlRpcRouterModule} {} {Module used to route incoming llRemoteData calls} {XmlRpcRouterModule XmlRpcGridRouterModule} XmlRpcRouterModule
6 ;; If enabled and set to XmlRpcRouterModule, this will post an event,
7 ;; "xmlrpc_uri(string)" to the script concurrently with the first
8 ;; remote_data event. This will contain the fully qualified URI an
9 ;; external site needs to use to send XMLRPC requests to that script
10 ;;
11 ;; If enabled and set to XmlRpcGridRouterModule, newly created channels
12 ;; will be registered with an external service via a configured uri
13 XmlRpcRouterModule = "XmlRpcRouterModule"
14
15 ;# {XmlRpcPort} {} {Port for incoming llRemoteData xmlrpc calls} {} 20800
16 XmlRpcPort = 20800
17
4 18
5[Startup] 19[Startup]
6 ; Console prompt 20 ; Console prompt