Merge branch 'master' of git://opensimulator.org/git/opensim

1 files changed, 8 insertions, 6 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index c5205db..253b24d 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -36,6 +36,14 @@
 
 
 [Startup]
+    ;# {ConsolePrompt} {} {ConsolePrompt} {} "Region (\R) "
+    ;; Console prompt
+    ;; Certain special characters can be used to customize the prompt
+    ;; Currently, these are
+    ;; \R - substitute region name
+    ;; \\ - substitute \
+    ; ConsolePrompt = "Region (\R) "
+
     ;# {save_crashes} {} {Save crashes to disk?} {true false} false
     ;; Set this to true if you want to log crashes to disk
     ;; this can be useful when submitting bug reports.
@@ -230,12 +238,6 @@
     ;; by scripts have changed.
     ; DeleteScriptsOnStartup = true
 
-    ;; Custom prompt
-    ;; This value replaces the word "Region" in console prompt
-    ;; (usualy "Region (regionName) # "
-    ;; Useful only if you have to monitor serveral servers
-    ; custom_prompt = "MyServer1"
-
 [SMTP]
     ;; The SMTP server enabled the email module to send email to external
     ;; destinations.