aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorDan Lake2011-11-10 14:09:53 -0800
committerDan Lake2011-11-10 14:09:53 -0800
commitf3fea81936bd1c5bb2963bd20c1f8753716848de (patch)
tree69492bae46ef44aaa1cf72484a8edb1a082eb89e /bin
parentWhen updating SOG, a physics taint should not override a full update with a t... (diff)
parentMerge branch 'master' of melanie@opensimulator.org:/var/git/opensim (diff)
downloadopensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.zip
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.gz
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.bz2
opensim-SC_OLD-f3fea81936bd1c5bb2963bd20c1f8753716848de.tar.xz
Merge branch 'master' of git://opensimulator.org/git/opensim
Diffstat (limited to 'bin')
-rwxr-xr-xbin/OpenSim.ini.example5
1 files changed, 5 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index e71fb05..c5205db 100755
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -230,6 +230,11 @@
230 ;; by scripts have changed. 230 ;; by scripts have changed.
231 ; DeleteScriptsOnStartup = true 231 ; DeleteScriptsOnStartup = true
232 232
233 ;; Custom prompt
234 ;; This value replaces the word "Region" in console prompt
235 ;; (usualy "Region (regionName) # "
236 ;; Useful only if you have to monitor serveral servers
237 ; custom_prompt = "MyServer1"
233 238
234[SMTP] 239[SMTP]
235 ;; The SMTP server enabled the email module to send email to external 240 ;; The SMTP server enabled the email module to send email to external