aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
Diffstat (limited to 'bin')
-rw-r--r--bin/MXP.pdbbin382464 -> 0 bytes
-rw-r--r--bin/OpenSim.ini.example22
-rw-r--r--bin/OpenSimDefaults.ini36
-rw-r--r--bin/protobuf-net.pdbbin331264 -> 0 bytes
4 files changed, 31 insertions, 27 deletions
diff --git a/bin/MXP.pdb b/bin/MXP.pdb
deleted file mode 100644
index deadeef..0000000
--- a/bin/MXP.pdb
+++ /dev/null
Binary files differ
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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 400d3df..bf36228 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 = false
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
@@ -216,13 +210,23 @@
216 210
217 ;WorldMapModule = "WorldMap" 211 ;WorldMapModule = "WorldMap"
218 ;MapImageModule = "MapImageModule" 212 ;MapImageModule = "MapImageModule"
213
219 ; Set to false to not generate any maptiles 214 ; Set to false to not generate any maptiles
220 ;GenerateMaptiles = "true" 215 ;GenerateMaptiles = true
216
221 ; Refresh (in seconds) the map tile periodically 217 ; Refresh (in seconds) the map tile periodically
222 ;MaptileRefresh = 0 218 ;MaptileRefresh = 0
219
223 ; If not generating maptiles, use this static texture asset ID 220 ; If not generating maptiles, use this static texture asset ID
224 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000" 221 ;MaptileStaticUUID = "00000000-0000-0000-0000-000000000000"
225 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
226 ; ## 230 ; ##
227 ; ## EMAIL MODULE 231 ; ## EMAIL MODULE
228 ; ## 232 ; ##
@@ -273,15 +277,15 @@
273 277
274 278
275[SMTP] 279[SMTP]
276 enabled=false 280 enabled = false
277 281
278 ;enabled=true 282 ;enabled = true
279 ;internal_object_host=lsl.opensim.local 283 ;internal_object_host = lsl.opensim.local
280 ;host_domain_header_from=127.0.0.1 284 ;host_domain_header_from = 127.0.0.1
281 ;SMTP_SERVER_HOSTNAME=127.0.0.1 285 ;SMTP_SERVER_HOSTNAME = 127.0.0.1
282 ;SMTP_SERVER_PORT=25 286 ;SMTP_SERVER_PORT = 25
283 ;SMTP_SERVER_LOGIN=foo 287 ;SMTP_SERVER_LOGIN = foo
284 ;SMTP_SERVER_PASSWORD=bar 288 ;SMTP_SERVER_PASSWORD = bar
285 289
286 290
287[Network] 291[Network]
diff --git a/bin/protobuf-net.pdb b/bin/protobuf-net.pdb
deleted file mode 100644
index 9c85bdc..0000000
--- a/bin/protobuf-net.pdb
+++ /dev/null
Binary files differ