fix merge

7 files changed, 14 insertions, 21 deletions

diff --git a/bin/CSJ2K.dll b/bin/CSJ2K.dll
index 238291f..e882e4c 100755
--- a/bin/CSJ2K.dll
+++ b/bin/CSJ2K.dll
diff --git a/bin/OpenMetaverse.Rendering.Meshmerizer.dll b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
index 1a12a1e..7087584 100755
--- a/bin/OpenMetaverse.Rendering.Meshmerizer.dll
+++ b/bin/OpenMetaverse.Rendering.Meshmerizer.dll
diff --git a/bin/OpenMetaverse.StructuredData.dll b/bin/OpenMetaverse.StructuredData.dll
index 7aeb089..dd3113d 100755
--- a/bin/OpenMetaverse.StructuredData.dll
+++ b/bin/OpenMetaverse.StructuredData.dll
diff --git a/bin/OpenMetaverse.dll b/bin/OpenMetaverse.dll
index 5c576a7..1a63a9f 100755
--- a/bin/OpenMetaverse.dll
+++ b/bin/OpenMetaverse.dll
diff --git a/bin/OpenMetaverseTypes.dll b/bin/OpenMetaverseTypes.dll
index a07cc1d..cf5080d 100755
--- a/bin/OpenMetaverseTypes.dll
+++ b/bin/OpenMetaverseTypes.dll
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index a9e368a..74888b3 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -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
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 0170a27..7bfb32a 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -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]