From 6c2f8176aea95297bbce7f6d2d0cba178b39ae5b Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 2 May 2017 11:39:29 +0100
Subject: change opensim.ini.example setting of ExternalHostNameForLSL to a
 defualt

---
 bin/OpenSim.ini.example | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index b0777d7..da4cbe1 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -52,8 +52,11 @@
     ; name and use default public port 9000. The private port is not used
     ; in the configuration for a standalone.
 
-    ;# {BaseURL} {} {BaseURL} {"http://example.com" "http://127.0.0.1"} "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"
+    
+    ;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname} https://${Const|BaseHostname}} "http://${Const|BaseHostname}"
+    BaseURL = http://${Const|BaseHostname}
     
     ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
     PublicPort = "8002"
@@ -525,10 +528,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
-- 
cgit v1.1


From 55f7986b449633477467f7fdda95873b4a00f8fd Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 2 May 2017 13:14:26 +0100
Subject: fix some comments

---
 bin/OpenSim.ini.example | 2 +-
 bin/OpenSimDefaults.ini | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index da4cbe1..021e444 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -55,7 +55,7 @@
     ;# {BaseHostname} {} {BaseHostname} {"example.com" "127.0.0.1"} "127.0.0.1"
     BaseHostname = "127.0.0.1"
     
-    ;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname} https://${Const|BaseHostname}} "http://${Const|BaseHostname}"
+    ;# {BaseURL} {} {BaseURL} {"http://${Const|BaseHostname}} "http://${Const|BaseHostname}"
     BaseURL = http://${Const|BaseHostname}
     
     ;# {PublicPort} {} {PublicPort} {8002 9000} "8002"
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index f70f7db..89954ef 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -600,8 +600,7 @@
     ; HttpBodyMaxLenMAX=16384
 
     ; 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)
+    ; if not defined - llRequestURL/llRequestSecureURL are disabled   
     ; ExternalHostNameForLSL=127.0.0.1
 
     ; Disallow the following address ranges for user scripting calls (e.g. llHttpRequest())
-- 
cgit v1.1


From 1bfe9354e375b77318dde4222e7fa01937d4c5b8 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Tue, 2 May 2017 15:45:33 +0100
Subject: coment out optional fields that should be edited and uncomented if
 needed

---
 bin/OpenSimDefaults.ini | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'bin')

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 89954ef..21ff8d6 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1898,7 +1898,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:
@@ -1906,14 +1907,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]
-- 
cgit v1.1