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

This commit is contained in:
Robert Adams
2013-05-30 19:20:36 -07:00
20 changed files with 3727 additions and 178 deletions

View File

@@ -377,6 +377,19 @@
AllowRegionRestartFromClient = true
[UserProfiles]
;# {ProfileURL} {} {Set url to UserProfilesService} {}
;; Set the value of the url to your UserProfilesService
;; If un-set / "" the module is disabled
;; If the ProfileURL is not set, then very BASIC
;; profile support will be configured. If the ProfileURL is set to a
;; valid URL, then full profile support will be configured. The URL
;; points to your grid's Robust user profiles service
;;
; ProfileURL = http://127.0.0.1:9000
[SMTP]
enabled = false