ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-12 04:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
UbitUmarov
2017-05-03 03:52:55 +01:00
parent a680d8b8d7 02b43f06d1
commit 832ca518d7
31 changed files with 1083 additions and 245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
bin/OpenSim.ini.example
View File

@@ -49,19 +49,13 @@
; this section defines constants for grid services
; to simplify other configuration files default settings
; BaseURL
; should be the externally accessible IP/DNS name of grid or standalone
; http://externalHostName or https://externalHostName if using ssl
; examples: http://mymachine.example.com, https://mymachine.example.com, https://127.0.0.1
; default: http://127.0.0.1
;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} ""
BaseURL = http://127.0.0.1
;# {BaseHostname} {} {BaseHostname} {"example.com" "127.0.0.1"} "127.0.0.1"
BaseHostname = "127.0.0.1"
; default public port
; usually 8002 for grids.
; on standalones it needs to match http_listener_port or http_listener_sslport if using ssl
; in [Network] section below (defaults 9000 or 9001 if using ssl)
;# {PublicPort} {} {PublicPort} {8002 9000 9001} "8002"
;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname}} "http://${Const|BaseHostname}"
BaseURL = http://${Const|BaseHostname}
;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
PublicPort = "8002"
;grid default private port 8003, not used in standalone
@@ -569,10 +563,9 @@
;# {ExternalHostNameForLSL} {} {Hostname to use for HTTP-IN URLs. This should be reachable from the internet.} {}
;; Hostname to use in llRequestURL/llRequestSecureURL
;; if not defined - default machine name is being used
;; (on Windows this mean NETBIOS name - useably only inside local network)
; ExternalHostNameForLSL = "127.0.0.1"
;; if not defined - llRequestURL/llRequestSecureURL are disabled
ExternalHostNameForLSL = ${Const|BaseHostname}
;# {shard} {} {Name to use for X-Secondlife-Shard header? (press enter if unsure)} {} OpenSim
;; What is reported as the "X-Secondlife-Shard"
;; Defaults to the user server url if not set