aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDiva Canto2013-02-27 20:49:41 -0800
committerDiva Canto2013-02-27 20:49:41 -0800
commitf1010d7b152b68e2961b40482006221e28e976af (patch)
tree6872908b7161842ff6e1db4c23acd39de82b2fbd /bin
parentMerge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff)
downloadopensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.zip
opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.gz
opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.bz2
opensim-SC_OLD-f1010d7b152b68e2961b40482006221e28e976af.tar.xz
Moved the HG default variables out of [Startup] and into their own section [Hypergrid] in *Common.ini.example. Backwards compatible for now.
Diffstat (limited to '')
-rw-r--r--bin/OpenSim.ini.example17
-rw-r--r--bin/config-include/GridCommon.ini.example20
-rw-r--r--bin/config-include/StandaloneCommon.ini.example21
3 files changed, 41 insertions, 17 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2756b32..9761052 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -320,23 +320,6 @@
320 ;; - "Imprudence 1.3.1" has access 320 ;; - "Imprudence 1.3.1" has access
321 ; BannedViewerList = 321 ; BannedViewerList =
322 322
323 ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
324 ;; If this is a standalone world, this is the address of this instance.
325 ;; If this is a grided simulator, this is the address of the external robust server that
326 ;; runs the UserAgentsService.
327 ;; For example http://myworld.com:9000 or http://myworld.com:8002
328 ;; This is a default that can be overwritten in some sections.
329 ; HomeURI = "http://127.0.0.1:9000"
330
331 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
332 ;; If this is a standalone world, this is the address of this instance.
333 ;; If this is a grided simulator, this is the address of the external robust server
334 ;; that runs the Gatekeeper service.
335 ;; For example http://myworld.com:9000 or http://myworld.com:8002
336 ;; This is a default that can be overwritten in some sections.
337 ; GatekeeperURI = "http://127.0.0.1:9000"
338
339
340[Map] 323[Map]
341 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true 324 ;# {GenerateMaptiles} {} {Generate map tiles?} {true false} true
342 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to 325 ;; Map tile options. You can choose to generate normal maptiles or nominate an uploaded texture to
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index e53fcca..d12ea5b 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -26,6 +26,26 @@
26 ;StorageProvider = "OpenSim.Data.MSSQL.dll" 26 ;StorageProvider = "OpenSim.Data.MSSQL.dll"
27 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" 27 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
28 28
29[Hypergrid]
30 ; Uncomment the variables in this section only if you are in
31 ; Hypergrid configuration. Otherwise, ignore.
32
33 ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
34 ;; If this is a standalone world, this is the address of this instance.
35 ;; If this is a grided simulator, this is the address of the external robust server that
36 ;; runs the UserAgentsService.
37 ;; For example http://myworld.com:9000 or http://myworld.com:8002
38 ;; This is a default that can be overwritten in some sections.
39 ; HomeURI = "http://127.0.0.1:9000"
40
41 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
42 ;; If this is a standalone world, this is the address of this instance.
43 ;; If this is a grided simulator, this is the address of the external robust server
44 ;; that runs the Gatekeeper service.
45 ;; For example http://myworld.com:9000 or http://myworld.com:8002
46 ;; This is a default that can be overwritten in some sections.
47 ; GatekeeperURI = "http://127.0.0.1:9000"
48
29[Modules] 49[Modules]
30 ;; Choose one cache module and the corresponding config file, if it exists. 50 ;; Choose one cache module and the corresponding config file, if it exists.
31 ;; Copy the config .example file into your own .ini file and adapt that. 51 ;; Copy the config .example file into your own .ini file and adapt that.
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 3129078..f80044e 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -27,6 +27,27 @@
27 ;StorageProvider = "OpenSim.Data.MSSQL.dll" 27 ;StorageProvider = "OpenSim.Data.MSSQL.dll"
28 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;" 28 ;ConnectionString = "Server=localhost\SQLEXPRESS;Database=opensim;User Id=opensim; password=***;"
29 29
30[Hypergrid]
31 ; Uncomment the variables in this section only if you are in
32 ; Hypergrid configuration. Otherwise, ignore.
33
34 ;# {HomeURI} {Hypergrid} {The Home URL of this world} {}
35 ;; If this is a standalone world, this is the address of this instance.
36 ;; If this is a grided simulator, this is the address of the external robust server that
37 ;; runs the UserAgentsService.
38 ;; For example http://myworld.com:9000 or http://myworld.com:8002
39 ;; This is a default that can be overwritten in some sections.
40 ; HomeURI = "http://127.0.0.1:9000"
41
42 ;# {GatekeeperURI} {Hypergrid} {The URL of the gatekeeper of this world} {}
43 ;; If this is a standalone world, this is the address of this instance.
44 ;; If this is a grided simulator, this is the address of the external robust server
45 ;; that runs the Gatekeeper service.
46 ;; For example http://myworld.com:9000 or http://myworld.com:8002
47 ;; This is a default that can be overwritten in some sections.
48 ; GatekeeperURI = "http://127.0.0.1:9000"
49
50
30[Modules] 51[Modules]
31 ;; Choose one cache module and the corresponding config file, if it exists. 52 ;; Choose one cache module and the corresponding config file, if it exists.
32 ;; Copy the config .example file into your own .ini file and alter that 53 ;; Copy the config .example file into your own .ini file and alter that