aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin
diff options
context:
space:
mode:
authorMelanie2011-11-10 17:35:35 +0000
committerMelanie2011-11-10 17:35:35 +0000
commita1426739a214d9cd04169bbb7a8855fdfd2ef588 (patch)
tree061416a45c8cdceb25273f9f79f078d2ba1ea8e5 /bin
parentFix the ability to move the seated avatar via LSL (diff)
parentAdd GuduleLapointe to list of contributors (diff)
downloadopensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.zip
opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.gz
opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.bz2
opensim-SC-a1426739a214d9cd04169bbb7a8855fdfd2ef588.tar.xz
Merge branch 'master' into bigmerge
Diffstat (limited to '')
-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