ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-10 19:36:07 +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

10
bin/OpenSimDefaults.ini
View File

@@ -614,8 +614,7 @@
; Hostname to use in llRequestURL/llRequestSecureURL
; must be a valid hostname for the ssl cert.
; if not defined - default machine name is being used
; (on Windows this mean NETBIOS name - useably only inside local network)
; if not defined - llRequestURL/llRequestSecureURL are disabled
; ExternalHostNameForLSL=127.0.0.1
; Disallow the following address ranges for user scripting calls (e.g. llHttpRequest())
@@ -1913,7 +1912,8 @@
; regex specifying for which regions concierge service is desired; if
; empty, then for all
regions = "^MeetingSpace-"
;regions = "^MeetingSpace-"
regions = ""
; for each region that matches the regions regexp you can provide
; (optionally) a welcome template using format substitution:
@@ -1921,14 +1921,14 @@
; {1} is replaced with the name of the region
; {2} is replaced with the name of the concierge (whoami variable above)
welcomes = /path/to/welcome/template/directory
;welcomes = /path/to/welcome/template/directory
; Concierge can send attendee lists to an event broker whenever an
; avatar enters or leaves a concierged region. the URL is subject
; to format substitution:
; {0} is replaced with the region's name
; {1} is replaced with the region's UUID
broker = "http://broker.place.com/{1}"
;broker = "http://broker.place.com/{1}"
[MRM]