OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into avinationmerge

avinationmerge
UbitUmarov 2015-11-12 23:04:04 +00:00
parent 55cce6aee0 c4d225ed50
commit f037f8335e
4 changed files with 20 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bin/OpenSim.ini.example
View File

@ -610,17 +610,16 @@
[SimulatorFeatures] [SimulatorFeatures]
;# {SearchServerURI} {} {URL of the search server} {} ;# {SearchServerURI} {} {URL of the search server} {}
;; This is identical to the Robust LoginService SearchURL setting ;; Optional. If given this serves the same purpose as the grid wide
;; and will override that value if set here. The Robust setting ;; [LoginServices] SearchURL setting and will override that where
;; provides a working default for the grid and setting here is ;; supported by viewers.
;; optional.
;SearchServerURI = "http://127.0.0.1:9000/" ;SearchServerURI = "http://127.0.0.1:9000/"
;# {DestinationGuideURI} {} {URL of the destination guide} {} ;# {DestinationGuideURI} {} {URL of the destination guide} {}
;; ;; Optional. If given this serves the same purpose as the grid wide
;; This serves the same purpose as the DestinationGuideURI in the ;; [LoginServices] DestinationGuide setting and will override that where
;; LoginService setting in the Robust server. This will override ;; supported by viewers.
;; the Robust setting if desired as an option. ;DestinationGuideURI = "http://127.0.0.1:9000/guide"
;DestinationGuideURI = "http://127.0.0.1:9000/"
[Chat] [Chat]

6
bin/Robust.HG.ini.example
View File

@ -551,12 +551,12 @@
; this as splash page ; this as splash page
;welcome = ${Const|BaseURL}/welcome ;welcome = ${Const|BaseURL}/welcome
; helper uri: optional: if it exists if will be used to tell the client to use ; helper uri: optional: if it exists it will be used to tell the client to use
; this for all economy related things ; this for all economy related things
;economy = ${Const|BaseURL}:${Const|PublicPort}/ ;economy = ${Const|BaseURL}/economy
; web page of grid: optional: page providing further information about your grid ; web page of grid: optional: page providing further information about your grid
;about = ${Const|BaseURL}/about/ ;about = ${Const|BaseURL}/about
; account creation: optional: page providing further information about obtaining ; account creation: optional: page providing further information about obtaining
; a user account on your grid ; a user account on your grid

6
bin/Robust.ini.example
View File

@ -538,12 +538,12 @@
; this as splash page ; this as splash page
;welcome = ${Const|BaseURL}/welcome ;welcome = ${Const|BaseURL}/welcome
; helper uri: optional: if it exists if will be used to tell the client to use ; helper uri: optional: if it exists it will be used to tell the client to use
; this for all economy related things ; this for all economy related things
;economy = ${Const|BaseURL}:${Const|PublicPort}/ ;economy = ${Const|BaseURL}/economy
; web page of grid: optional: page providing further information about your grid ; web page of grid: optional: page providing further information about your grid
;about = ${Const|BaseURL}/about/ ;about = ${Const|BaseURL}/about
; account creation: optional: page providing further information about obtaining ; account creation: optional: page providing further information about obtaining
; a user account on your grid ; a user account on your grid

14
bin/config-include/StandaloneCommon.ini.example
View File

@ -134,6 +134,9 @@
; Url to search service ; Url to search service
; SearchURL = "${Const|BaseURL}:${Const|PublicPort}"; ; SearchURL = "${Const|BaseURL}:${Const|PublicPort}";
; For V3 destination guide
; DestinationGuide = "${Const|BaseURL}/guide"
; The minimum user level required for a user to be able to login. 0 by default ; The minimum user level required for a user to be able to login. 0 by default
; If you disable a particular user's account then you can set their login level below this number. ; If you disable a particular user's account then you can set their login level below this number.
; You can also change this level from the console though these changes will not be persisted. ; You can also change this level from the console though these changes will not be persisted.
@ -222,26 +225,21 @@
; information on a standalone ; information on a standalone
;welcome = ${Const|BaseURL}/welcome ;welcome = ${Const|BaseURL}/welcome
; helper uri: optional: if it exists if will be used to tell the client to use ; helper uri: optional: if it exists it will be used to tell the client to use
; this for all economy related things ; this for all economy related things
; currently unused ;economy = ${Const|BaseURL}/economy
;economy = ${Const|BaseURL}:${Const|PublicPort}/
; web page of grid: optional: page providing further information about your grid ; web page of grid: optional: page providing further information about your grid
; currently unused ;about = ${Const|BaseURL}/about
;about = ${Const|BaseURL}/about/
; account creation: optional: page providing further information about obtaining ; account creation: optional: page providing further information about obtaining
; a user account on your grid ; a user account on your grid
; currently unused
;register = ${Const|BaseURL}/register ;register = ${Const|BaseURL}/register
; help: optional: page providing further assistance for users of your grid ; help: optional: page providing further assistance for users of your grid
; currently unused
;help = ${Const|BaseURL}/help ;help = ${Const|BaseURL}/help
; password help: optional: page providing password assistance for users of your grid ; password help: optional: page providing password assistance for users of your grid
; currently unused
;password = ${Const|BaseURL}/password ;password = ${Const|BaseURL}/password
; HG address of the gatekeeper, if you have one ; HG address of the gatekeeper, if you have one