aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2012-09-25 23:32:52 +0100
committerJustin Clark-Casey (justincc)2012-09-25 23:32:52 +0100
commit92afa6aa44073e9e5b641f44aed9dee56dfa6e73 (patch)
tree316e3237a732756b5b9ddeeb7500667a12fba358
parentFix very recently introduced race condition where a CreateNewItem outracing a... (diff)
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-92afa6aa44073e9e5b641f44aed9dee56dfa6e73.zip
opensim-SC_OLD-92afa6aa44073e9e5b641f44aed9dee56dfa6e73.tar.gz
opensim-SC_OLD-92afa6aa44073e9e5b641f44aed9dee56dfa6e73.tar.bz2
opensim-SC_OLD-92afa6aa44073e9e5b641f44aed9dee56dfa6e73.tar.xz
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
-rw-r--r--bin/OpenSim.ini.example100
1 files changed, 65 insertions, 35 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 3ec4bab..b21a214 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1,19 +1,23 @@
1;; This is the main configuration file for OpenSimulator. If it's named OpenSim.ini 1;; This is the main configuration file for OpenSimulator.
2;; then it will be loaded by OpenSimulator. If it's named OpenSim.ini.example then 2;; If it's named OpenSim.ini then it will be loaded by OpenSimulator.
3;; you will need to copy it to OpenSim.ini first (if that file does not already exist) 3;; If it's named OpenSim.ini.example then you will need to copy it to
4;; OpenSim.ini first (if that file does not already exist)
4;; 5;;
5;; If you are copying, then once you have copied OpenSim.ini.example to OpenSim.ini you will 6;; If you are copying, then once you have copied OpenSim.ini.example to
6;; need to pick an architecture in the [Architecture] section at the end of this file. 7;; OpenSim.ini you will need to pick an architecture in the [Architecture]
8;; section at the end of this file.
7;; 9;;
8;; The settings in this file are in the form "<key> = <value>". For example, save_crashes = false 10;; The settings in this file are in the form "<key> = <value>". For example,
9;; in the [Startup] section below. 11;; save_crashes = false in the [Startup] section below.
10;; 12;;
11;; All settings are initially commented out and the default value used, as found in 13;; All settings are initially commented out and the default value used, as
12;; OpenSimDefaults.ini. To change a setting, first uncomment it by deleting the initial semicolon (;) 14;; found in OpenSimDefaults.ini. To change a setting, first uncomment it by
13;; and then change the value. This will override the value in OpenSimDefaults.ini 15;; deleting the initial semicolon (;) and then change the value. This will
16;; override the value in OpenSimDefaults.ini
14;; 17;;
15;; If you want to find out what configuration OpenSimulator has finished with once all the configuration 18;; If you want to find out what configuration OpenSimulator has finished with
16;; files are loaded then type "config show" on the region console command line. 19;; once all the configuration files are loaded then type "config show" on the
20;; region console command line.
17;; 21;;
18;; 22;;
19;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE 23;; NOTES FOR DEVELOPERS REGARDING THE FORMAT OF THIS FILE
@@ -26,13 +30,16 @@
26;; formatted as: 30;; formatted as:
27;; {option} {depends on} {question to ask} {choices} default value 31;; {option} {depends on} {question to ask} {choices} default value
28;; Any text comments following the declaration, up to the next blank line. 32;; Any text comments following the declaration, up to the next blank line.
29;; will be copied to the generated file (NOTE: generation is not yet implemented) 33;; will be copied to the generated file (NOTE: generation is not yet
34;; implemented)
35;;
30;; A * in the choices list will allow an empty entry. 36;; A * in the choices list will allow an empty entry.
31;; An empty question will set the default if the dependencies are 37;; An empty question will set the default if the dependencies are
32;; satisfied. 38;; satisfied.
33;; 39;;
34;; ; denotes a commented out option. 40;; ; denotes a commented out option.
35;; Any options added to OpenSim.ini.example should be initially commented out. 41;; Any options added to OpenSim.ini.example should be initially commented
42;; out.
36 43
37 44
38[Startup] 45[Startup]
@@ -47,9 +54,12 @@
47 ;# {save_crashes} {} {Save crashes to disk?} {true false} false 54 ;# {save_crashes} {} {Save crashes to disk?} {true false} false
48 ;; Set this to true if you want to log crashes to disk 55 ;; Set this to true if you want to log crashes to disk
49 ;; this can be useful when submitting bug reports. 56 ;; this can be useful when submitting bug reports.
50 ;; However, this will only log crashes within OpenSimulator that cause the entire program to exit 57 ;; However, this will only log crashes within OpenSimulator that cause the
51 ;; It will not log crashes caused by virtual machine failures, which includes mono and ODE failures. 58 ;; entire program to exit
52 ;; You will need to capture these native stack traces by recording the session log itself. 59 ;; It will not log crashes caused by virtual machine failures, which
60 ;; includes mono and ODE failures.
61 ;; You will need to capture these native stack traces by recording the
62 ;; session log itself.
53 ; save_crashes = false 63 ; save_crashes = false
54 64
55 ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes 65 ;# {crash_dir} {save_crashes:true} {Directory to save crashes to?} {} crashes
@@ -88,35 +98,46 @@
88 ; allow_regionless = false 98 ; allow_regionless = false
89 99
90 ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001 100 ;# {NonPhysicalPrimMin} {} {Minimum size of nonphysical prims?} {} 0.001
91 ;; Minimum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMin!). 101 ;; Minimum size for non-physical prims. Affects resizing of existing
102 ;; prims. This can be overriden in the region config file (as
103 ;; NonPhysicalPrimMin!).
92 ; NonPhysicalPrimMin = 0.001 104 ; NonPhysicalPrimMin = 0.001
93 105
94 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256 106 ;# {NonPhysicalPrimMax} {} {Maximum size of nonphysical prims?} {} 256
95 ;; Maximum size for non-physical prims. Affects resizing of existing prims. This can be overriden in the region config file (as NonPhysicalPrimMax!). 107 ;; Maximum size for non-physical prims. Affects resizing of existing
108 ;; prims. This can be overriden in the region config file (as
109 ;; NonPhysicalPrimMax!).
96 ; NonPhysicalPrimMax = 256 110 ; NonPhysicalPrimMax = 256
97 111
98 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10 112 ;# {PhysicalPrimMin} {} {Minimum size of physical prims?} {} 10
99 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 113 ;; Maximum size where a prim can be physical. Affects resizing of
114 ;; existing prims. This can be overriden in the region config file.
100 ; PhysicalPrimMin = 0.01 115 ; PhysicalPrimMin = 0.01
101 116
102 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10 117 ;# {PhysicalPrimMax} {} {Maximum size of physical prims?} {} 10
103 ;; Maximum size where a prim can be physical. Affects resizing of existing prims. This can be overriden in the region config file. 118 ;; Maximum size where a prim can be physical. Affects resizing of
119 ;; existing prims. This can be overriden in the region config file.
104 ; PhysicalPrimMax = 10 120 ; PhysicalPrimMax = 10
105 121
106 ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false 122 ;# {ClampPrimSize} {} {Clamp viewer rezzed prims to max sizes?} {true false} false
107 ;; If a viewer attempts to rez a prim larger than the non-physical or physical prim max, clamp the dimensions to the appropriate maximum 123 ;; If a viewer attempts to rez a prim larger than the non-physical or
124 ;; physical prim max, clamp the dimensions to the appropriate maximum
108 ;; This can be overriden in the region config file. 125 ;; This can be overriden in the region config file.
109 ; ClampPrimSize = false 126 ; ClampPrimSize = false
110 127
111 ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0 128 ;# {LinksetPrims} {} {Max prims an object will hold?} {} 0
112 ;; Maximum number of prims allowable in a linkset. Affects creating new linksets. Ignored if less than or equal to zero. 129 ;; Maximum number of prims allowable in a linkset. Affects creating new
130 ;; linksets. Ignored if less than or equal to zero.
113 ;; This can be overriden in the region config file. 131 ;; This can be overriden in the region config file.
114 ; LinksetPrims = 0 132 ; LinksetPrims = 0
115 133
116 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true 134 ;# {AllowScriptCrossing} {} {Allow scripts to cross into this region} {true false} true
117 ;; Allow scripts to keep running when they cross region boundaries, rather than being restarted. State is reloaded on the destination region. 135 ;; Allow scripts to keep running when they cross region boundaries, rather
118 ;; This only applies when crossing to a region running in a different simulator. 136 ;; than being restarted. State is reloaded on the destination region.
119 ;; For crossings where the regions are on the same simulator the script is always kept running. 137 ;; This only applies when crossing to a region running in a different
138 ;; simulator.
139 ;; For crossings where the regions are on the same simulator the script is
140 ;; always kept running.
120 ; AllowScriptCrossing = true 141 ; AllowScriptCrossing = true
121 142
122 ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false 143 ;# {TrustBinaries} {AllowScriptCrossing:true} {Accept compiled binary script code? (DANGEROUS!)} {true false} false
@@ -186,7 +207,8 @@
186 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine 207 ;# {physics} {} {Select physics engine} {OpenDynamicsEngine BulletSim basicphysics POS} OpenDynamicsEngine
187 ;; OpenDynamicsEngine is by some distance the most developed physics engine 208 ;; OpenDynamicsEngine is by some distance the most developed physics engine
188 ;; BulletSim is incomplete and experimental but in active development 209 ;; BulletSim is incomplete and experimental but in active development
189 ;; basicphysics effectively does not model physics at all, making all objects phantom 210 ;; basicphysics effectively does not model physics at all, making all
211 ;; objects phantom
190 ;; Default is OpenDynamicsEngine 212 ;; Default is OpenDynamicsEngine
191 ; physics = OpenDynamicsEngine 213 ; physics = OpenDynamicsEngine
192 ; physics = BulletSim 214 ; physics = BulletSim
@@ -229,8 +251,9 @@
229 ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false 251 ;# {simple_build_permissions} {} {Allow building in parcel by access list (no groups)} {true false} false
230 ;; More control over permissions 252 ;; More control over permissions
231 ;; This is definitely not SL! 253 ;; This is definitely not SL!
232 ;; Provides a simple control for land owners to give build rights to specific avatars 254 ;; Provides a simple control for land owners to give build rights to
233 ;; in publicly accessible parcels that disallow object creation in general. 255 ;; specific avatars in publicly accessible parcels that disallow object
256 ;; creation in general.
234 ;; Owners specific avatars by adding them to the Access List of the parcel 257 ;; Owners specific avatars by adding them to the Access List of the parcel
235 ;; without having to use the Groups feature 258 ;; without having to use the Groups feature
236 ; simple_build_permissions = false 259 ; simple_build_permissions = false
@@ -266,11 +289,14 @@
266 ; DrawPrimOnMapTile = true 289 ; DrawPrimOnMapTile = true
267 290
268 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080 291 ;# {HttpProxy} {} {Proxy URL for llHTTPRequest and dynamic texture loading} {} http://proxy.com:8080
269 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if required 292 ;; Http proxy setting for llHTTPRequest and dynamic texture loading, if
293 ;; required
270 ; HttpProxy = "http://proxy.com:8080" 294 ; HttpProxy = "http://proxy.com:8080"
271 295
272 ;# {HttpProxyExceptions} {HttpProxy} {Set of regular expressions defining URL that should not be proxied} {} 296 ;# {HttpProxyExceptions} {HttpProxy} {Set of regular expressions defining URL that should not be proxied} {}
273 ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a list of regular expressions for URLs that you don't want to go through the proxy 297 ;; If you're using HttpProxy, then you can set HttpProxyExceptions to a
298 ;; list of regular expressions for URLs that you don't want to go through
299 ;; the proxy.
274 ;; For example, servers inside your firewall. 300 ;; For example, servers inside your firewall.
275 ;; Separate patterns with a ';' 301 ;; Separate patterns with a ';'
276 ; HttpProxyExceptions = ".mydomain.com;localhost" 302 ; HttpProxyExceptions = ".mydomain.com;localhost"
@@ -289,13 +315,15 @@
289 ; SpawnPointRouting = closest 315 ; SpawnPointRouting = closest
290 316
291 ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false 317 ;# {TelehubAllowLandmark} {} {Allow users with landmarks to override telehub routing} {true false} false
292 ;; TelehubAllowLandmark allows users with landmarks to override telehub routing and land at the landmark coordinates when set to true 318 ;; TelehubAllowLandmark allows users with landmarks to override telehub
319 ;; routing and land at the landmark coordinates when set to true
293 ;; default is false 320 ;; default is false
294 ; TelehubAllowLandmark = false 321 ; TelehubAllowLandmark = false
295 322
296 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {} 323 ;# {AllowedClients} {} {Bar (|) separated list of allowed clients} {}
297 ;; Bar (|) separated list of viewers which may gain access to the regions. 324 ;; Bar (|) separated list of viewers which may gain access to the regions.
298 ;; One can use a substring of the viewer name to enable only certain versions 325 ;; One can use a substring of the viewer name to enable only certain
326 ;; versions
299 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 327 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
300 ;; - "Imprudence" has access 328 ;; - "Imprudence" has access
301 ;; - "Imprudence 1.3" has access 329 ;; - "Imprudence 1.3" has access
@@ -304,7 +332,8 @@
304 332
305 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {} 333 ;# {BannedClients} {} {Bar (|) separated list of banned clients} {}
306 ;# Bar (|) separated list of viewers which may not gain access to the regions. 334 ;# Bar (|) separated list of viewers which may not gain access to the regions.
307 ;; One can use a Substring of the viewer name to disable only certain versions 335 ;; One can use a Substring of the viewer name to disable only certain
336 ;; versions
308 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0" 337 ;; Example: Agent uses the viewer "Imprudence 1.3.2.0"
309 ;; - "Imprudence" has no access 338 ;; - "Imprudence" has no access
310 ;; - "Imprudence 1.3" has no access 339 ;; - "Imprudence 1.3" has no access
@@ -450,7 +479,8 @@
450[SimulatorFeatures] 479[SimulatorFeatures]
451 480
452 ;# {MapImageServerURI} {} {URL for the map server} {} 481 ;# {MapImageServerURI} {} {URL for the map server} {}
453 ; Experimental new information sent in SimulatorFeatures cap for Kokua viewers 482 ; Experimental new information sent in SimulatorFeatures cap for Kokua
483 ; viewers
454 ; meant to override the MapImage and search server url given at login, and varying 484 ; meant to override the MapImage and search server url given at login, and varying
455 ; on a sim-basis. 485 ; on a sim-basis.
456 ; Viewers that don't understand it, will ignore it 486 ; Viewers that don't understand it, will ignore it