aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorAi Austin2015-09-08 21:53:49 +0100
committerMichael Cerquoni2015-11-12 12:44:53 -0500
commitc4d225ed501195bd1c758fb05475f9291db44ca6 (patch)
tree5c32e3f7b0970e5c7e10de9fce8f1d8e2ca4becb
parentDon't crash the sim if the map image is null. (diff)
downloadopensim-SC-c4d225ed501195bd1c758fb05475f9291db44ca6.zip
opensim-SC-c4d225ed501195bd1c758fb05475f9291db44ca6.tar.gz
opensim-SC-c4d225ed501195bd1c758fb05475f9291db44ca6.tar.bz2
opensim-SC-c4d225ed501195bd1c758fb05475f9291db44ca6.tar.xz
Corrections to ini example files for standalones v2
Remove "currently unused" indicators for some parameters and add missing "DestinationGuide" parameter in [GridServiceInfo] in StandaloneCommon.ini.example as they do work for a standalone. Regularize example URLs for externally provided web page and economy helper information for uniformity. Correct mistake in reference to grid wide DestinationGuide in override capability in OpenSim.ini.example. Signed-off-by: Michael Cerquoni <nebadon2025@gmail.com>
-rw-r--r--bin/OpenSim.ini.example17
-rw-r--r--bin/Robust.HG.ini.example6
-rw-r--r--bin/Robust.ini.example6
-rw-r--r--bin/config-include/StandaloneCommon.ini.example14
4 files changed, 20 insertions, 23 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index f5268bd..d395efe 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -610,17 +610,16 @@
610[SimulatorFeatures] 610[SimulatorFeatures]
611 611
612 ;# {SearchServerURI} {} {URL of the search server} {} 612 ;# {SearchServerURI} {} {URL of the search server} {}
613 ;; This is identical to the Robust LoginService SearchURL setting 613 ;; Optional. If given this serves the same purpose as the grid wide
614 ;; and will override that value if set here. The Robust setting 614 ;; [LoginServices] SearchURL setting and will override that where
615 ;; provides a working default for the grid and setting here is 615 ;; supported by viewers.
616 ;; optional.
617 ;SearchServerURI = "http://127.0.0.1:9000/" 616 ;SearchServerURI = "http://127.0.0.1:9000/"
617
618 ;# {DestinationGuideURI} {} {URL of the destination guide} {} 618 ;# {DestinationGuideURI} {} {URL of the destination guide} {}
619 ;; 619 ;; Optional. If given this serves the same purpose as the grid wide
620 ;; This serves the same purpose as the DestinationGuideURI in the 620 ;; [LoginServices] DestinationGuide setting and will override that where
621 ;; LoginService setting in the Robust server. This will override 621 ;; supported by viewers.
622 ;; the Robust setting if desired as an option. 622 ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
623 ;DestinationGuideURI = "http://127.0.0.1:9000/"
624 623
625 624
626[Chat] 625[Chat]
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 82eaf1f..6af444c 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -551,12 +551,12 @@
551 ; this as splash page 551 ; this as splash page
552 ;welcome = ${Const|BaseURL}/welcome 552 ;welcome = ${Const|BaseURL}/welcome
553 553
554 ; helper uri: optional: if it exists if will be used to tell the client to use 554 ; helper uri: optional: if it exists it will be used to tell the client to use
555 ; this for all economy related things 555 ; this for all economy related things
556 ;economy = ${Const|BaseURL}:${Const|PublicPort}/ 556 ;economy = ${Const|BaseURL}/economy
557 557
558 ; web page of grid: optional: page providing further information about your grid 558 ; web page of grid: optional: page providing further information about your grid
559 ;about = ${Const|BaseURL}/about/ 559 ;about = ${Const|BaseURL}/about
560 560
561 ; account creation: optional: page providing further information about obtaining 561 ; account creation: optional: page providing further information about obtaining
562 ; a user account on your grid 562 ; a user account on your grid
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 8d6496d..099d4da 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -538,12 +538,12 @@
538 ; this as splash page 538 ; this as splash page
539 ;welcome = ${Const|BaseURL}/welcome 539 ;welcome = ${Const|BaseURL}/welcome
540 540
541 ; helper uri: optional: if it exists if will be used to tell the client to use 541 ; helper uri: optional: if it exists it will be used to tell the client to use
542 ; this for all economy related things 542 ; this for all economy related things
543 ;economy = ${Const|BaseURL}:${Const|PublicPort}/ 543 ;economy = ${Const|BaseURL}/economy
544 544
545 ; web page of grid: optional: page providing further information about your grid 545 ; web page of grid: optional: page providing further information about your grid
546 ;about = ${Const|BaseURL}/about/ 546 ;about = ${Const|BaseURL}/about
547 547
548 ; account creation: optional: page providing further information about obtaining 548 ; account creation: optional: page providing further information about obtaining
549 ; a user account on your grid 549 ; a user account on your grid
diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 76d7a99..d0b152c 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -134,6 +134,9 @@
134 ; Url to search service 134 ; Url to search service
135 ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}"; 135 ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}";
136 136
137 ; For V3 destination guide
138 ; DestinationGuide = "${Const|BaseURL}/guide"
139
137 ; The minimum user level required for a user to be able to login. 0 by default 140 ; The minimum user level required for a user to be able to login. 0 by default
138 ; If you disable a particular user's account then you can set their login level below this number. 141 ; If you disable a particular user's account then you can set their login level below this number.
139 ; You can also change this level from the console though these changes will not be persisted. 142 ; You can also change this level from the console though these changes will not be persisted.
@@ -222,26 +225,21 @@
222 ; information on a standalone 225 ; information on a standalone
223 ;welcome = ${Const|BaseURL}/welcome 226 ;welcome = ${Const|BaseURL}/welcome
224 227
225 ; helper uri: optional: if it exists if will be used to tell the client to use 228 ; helper uri: optional: if it exists it will be used to tell the client to use
226 ; this for all economy related things 229 ; this for all economy related things
227 ; currently unused 230 ;economy = ${Const|BaseURL}/economy
228 ;economy = ${Const|BaseURL}:${Const|PublicPort}/
229 231
230 ; web page of grid: optional: page providing further information about your grid 232 ; web page of grid: optional: page providing further information about your grid
231 ; currently unused 233 ;about = ${Const|BaseURL}/about
232 ;about = ${Const|BaseURL}/about/
233 234
234 ; account creation: optional: page providing further information about obtaining 235 ; account creation: optional: page providing further information about obtaining
235 ; a user account on your grid 236 ; a user account on your grid
236 ; currently unused
237 ;register = ${Const|BaseURL}/register 237 ;register = ${Const|BaseURL}/register
238 238
239 ; help: optional: page providing further assistance for users of your grid 239 ; help: optional: page providing further assistance for users of your grid
240 ; currently unused
241 ;help = ${Const|BaseURL}/help 240 ;help = ${Const|BaseURL}/help
242 241
243 ; password help: optional: page providing password assistance for users of your grid 242 ; password help: optional: page providing password assistance for users of your grid
244 ; currently unused
245 ;password = ${Const|BaseURL}/password 243 ;password = ${Const|BaseURL}/password
246 244
247 ; HG address of the gatekeeper, if you have one 245 ; HG address of the gatekeeper, if you have one