aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2011-07-21 03:18:10 +0100
committerJustin Clark-Casey (justincc)2011-07-21 03:18:10 +0100
commit0a09c45726a0115b34c34ecbfa5bf48dff501590 (patch)
treeccfe898f5e20c17f8f677c4905dc1171d3e9a64d
parentremove pointless quotes from GenerateMaptiles option in OpenSimDefaults.ini (diff)
downloadopensim-SC_OLD-0a09c45726a0115b34c34ecbfa5bf48dff501590.zip
opensim-SC_OLD-0a09c45726a0115b34c34ecbfa5bf48dff501590.tar.gz
opensim-SC_OLD-0a09c45726a0115b34c34ecbfa5bf48dff501590.tar.bz2
opensim-SC_OLD-0a09c45726a0115b34c34ecbfa5bf48dff501590.tar.xz
minor: group all the map tile options together
-rw-r--r--bin/OpenSim.ini.example18
-rw-r--r--bin/OpenSimDefaults.ini13
2 files changed, 16 insertions, 15 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b21e3e2..acad0f3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -68,15 +68,6 @@
68 ;; in a <Regions> tag. 68 ;; in a <Regions> tag.
69 ; regionload_webserver_url = "http://example.com/regions.xml"; 69 ; regionload_webserver_url = "http://example.com/regions.xml";
70 70
71 ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
72 ;; Use terrain texture for maptiles if true, use shaded green if false
73 ; TextureOnMapTile = true
74
75 ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
76 ;; Draw objects on maptile. This step might take a long time if you've
77 ;; got a large number of objects, so you can turn it off here if you'd like.
78 ; DrawPrimOnMapTile = true
79
80 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 71 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
81 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 72 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
82 ; NonPhysicalPrimMax = 256 73 ; NonPhysicalPrimMax = 256
@@ -200,6 +191,15 @@
200 ;; If not generating maptiles, use this static texture asset ID 191 ;; If not generating maptiles, use this static texture asset ID
201 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 192 ; MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
202 193
194 ;# {TextureOnMapTile} {} {Use terrain textures for map tiles?} {true false} true
195 ;; Use terrain texture for maptiles if true, use shaded green if false
196 ; TextureOnMapTile = true
197
198 ;# {DrawPrimOnMapTile} {} {Draw prim shapes on map tiles?} {true false} false
199 ;; Draw objects on maptile. This step might take a long time if you've
200 ;; got a large number of objects, so you can turn it off here if you'd like.
201 ; DrawPrimOnMapTile = true
202
203 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required 203 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required
204 ; HttpProxy = "http://proxy.com:8080" 204 ; HttpProxy = "http://proxy.com:8080"
205 205
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index b6b4d6b..d1b3ae6 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -67,12 +67,6 @@
67 ; except that everything is also enclosed in a <Regions> tag. 67 ; except that everything is also enclosed in a <Regions> tag.
68 ; regionload_webserver_url = "http://example.com/regions.xml"; 68 ; regionload_webserver_url = "http://example.com/regions.xml";
69 69
70 ; Draw objects on maptile. This step might take a long time if you've got a large number of
71 ; objects, so you can turn it off here if you'd like.
72 DrawPrimOnMapTile = true
73 ; Use terrain texture for maptiles if true, use shaded green if false
74 TextureOnMapTile = true
75
76 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!). 70 ; Maximum size of non physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonphysicalPrimMax!).
77 NonPhysicalPrimMax = 256 71 NonPhysicalPrimMax = 256
78 72
@@ -226,6 +220,13 @@
226 ; If not generating maptiles, use this static texture asset ID 220 ; If not generating maptiles, use this static texture asset ID
227 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 221 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
228 222
223 ; Draw objects on maptile. This step might take a long time if you've got a large number of
224 ; objects, so you can turn it off here if you'd like.
225 DrawPrimOnMapTile = true
226
227 ; Use terrain texture for maptiles if true, use shaded green if false
228 TextureOnMapTile = true
229
229 ; ## 230 ; ##
230 ; ## EMAIL MODULE 231 ; ## EMAIL MODULE
231 ; ## 232 ; ##