Merge branch 'master' into careminster

2 files changed, 2 insertions, 0 deletions

diff --git a/bin/OpenSim.Server.ini.example b/bin/OpenSim.Server.ini.example
index f3d222f..12af0cd 100644
--- a/bin/OpenSim.Server.ini.example
+++ b/bin/OpenSim.Server.ini.example
@@ -22,6 +22,7 @@ port = 8003
 ; * Leave commented to diable logins to the console
 ;ConsoleUser = Test
 ;ConsolePass = secret
+;ConsolePort = 0
 
 ; * As an example, the below configuration precisely mimicks the legacy
 ; * asset server. It is read by the asset IN connector (defined above)
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 43e1d50..fa2a4a1 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -326,6 +326,7 @@
     ConsoleUser = "Test"
     ConsolePass = "secret"
     http_listener_port = 9000
+    console_port = 0
     default_location_x = 1000
     default_location_y = 1000