Merge branch 'master' into httptests

3 files changed, 12 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7426980..0544f36 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1202,6 +1202,11 @@
   ;; Set the value of the url to your UserProfilesService
   ;; If un-set / "" the module is disabled
   ;; ProfileServiceURL = ${Const|BaseURL}:${Const|PublicPort}
+  
+  ;# {AllowUserProfileWebURLs} {} {allow user profiles web urls} {true false} true
+  ;; set this to false to prevent your users to be sent to unknown
+  ;; web sites by other users on their profiles
+  ; AllowUserProfileWebURLs = true
 
 [XBakes]
   ;# {URL} {} {Set URL for Baked texture service} {}
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index a8566e2..fa491fc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -552,6 +552,10 @@
   ;; points to your grid's Robust user profiles service
   ;; 
   ; ProfileURL = http://127.0.0.1:9000
+  
+  ;; set this to false to prevent your users to be sent to unknown
+  ;; web sites by other users on their profiles
+  ; AllowUserProfileWebURLs = true
 
 
 [SMTP]
diff --git a/bin/config-include/osslEnable.ini b/bin/config-include/osslEnable.ini
index 59a162a..a064f09 100644
--- a/bin/config-include/osslEnable.ini
+++ b/bin/config-include/osslEnable.ini
@@ -139,8 +139,9 @@
   Allow_osMessageObject =           ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   Allow_osRegexIsMatch =            true
   Allow_osGetAvatarHomeURI =            ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSetProfileAbout =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
-  Allow_osNpcSetProfileImage =      ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
+  Allow_osNpcSetProfileAbout =      ${XEngine|osslNPC}
+  Allow_osNpcSetProfileImage =      ${XEngine|osslNPC}
+  Allow_osDie =                     ${XEngine|osslParcelOG}ESTATE_MANAGER,ESTATE_OWNER
   
   ; ThreatLevel  Moderate
   Allow_osDropAttachment =          ${XEngine|osslParcelO}ESTATE_MANAGER,ESTATE_OWNER