aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin/OpenSim.ini.example
diff options
context:
space:
mode:
authorroot2011-07-21 21:12:50 +0100
committerroot2011-07-21 21:12:50 +0100
commitd8228f4374de8ab4274a54aae75c371cff6c4551 (patch)
tree0af2bdcb0c1c105b5be367f4287cc0238067dbba /bin/OpenSim.ini.example
parentWhen an uncached asset is requested multiple times concurrently, only load it... (diff)
parentremove the windows debugging symbols for the long protobuf-net (diff)
downloadopensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.zip
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.gz
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.bz2
opensim-SC_OLD-d8228f4374de8ab4274a54aae75c371cff6c4551.tar.xz
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'bin/OpenSim.ini.example')
-rw-r--r--bin/OpenSim.ini.example22
1 files changed, 11 insertions, 11 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 60d37fb..2fe4db7 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} false
72 ;; Use terrain texture for maptiles if true, use shaded green if false
73 ; TextureOnMapTile = false
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
@@ -190,7 +181,7 @@
190 ;; Map tile options. You can choose to generate no map tiles at all, 181 ;; Map tile options. You can choose to generate no map tiles at all,
191 ;; generate normal maptiles, or nominate an uploaded texture to 182 ;; generate normal maptiles, or nominate an uploaded texture to
192 ;; be the map tile 183 ;; be the map tile
193 ; GenerateMaptiles = "true" 184 ; GenerateMaptiles = true
194 185
195 ;; If desired, a running region can update the map tiles periodically 186 ;; If desired, a running region can update the map tiles periodically
196 ;; to reflect building activity. This names no sense of you don't have 187 ;; to reflect building activity. This names no sense of you don't have
@@ -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
@@ -218,7 +218,7 @@
218 ;; The SMTP server enabled the email module to send email to external 218 ;; The SMTP server enabled the email module to send email to external
219 ;; destinations. 219 ;; destinations.
220 220
221 ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} true 221 ;# {enabled} {[Startup]emailmodule:DefaultEmailModule} {Enable SMTP service?} {true false} false
222 ;; Enable sending email via SMTP 222 ;; Enable sending email via SMTP
223 ; enabled = false 223 ; enabled = false
224 224