Merge branch 'master' into careminster

Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs

1 files changed, 10 insertions, 6 deletions

diff --git a/bin/config-include/StandaloneCommon.ini.example b/bin/config-include/StandaloneCommon.ini.example
index 4f4f400..e4bc548 100644
--- a/bin/config-include/StandaloneCommon.ini.example
+++ b/bin/config-include/StandaloneCommon.ini.example
@@ -61,6 +61,10 @@
     ;; uncomment the next line. You may want to do this on sims that have licensed content.
     ; OutboundPermission = False
 
+[HGFriendsModule]
+    ; User level required to be able to send friendship invitations to foreign users
+    ;LevelHGFriends = 0;
+
 [GridService]
     ;; For in-memory region storage (default)
     StorageProvider = "OpenSim.Data.Null.dll:NullRegionData"
@@ -231,13 +235,13 @@
     ; currently unused
     ;password = http://127.0.0.1/password
 
-        ; HG address of the gatekeeper, if you have one
-        ; this is the entry point for all the regions of the world
-        ; gatekeeper = http://127.0.0.1:9000/
+    ; HG address of the gatekeeper, if you have one
+    ; this is the entry point for all the regions of the world
+    ; gatekeeper = http://127.0.0.1:9000/
 
-        ; HG user domain, if you have one
-        ; this is the entry point for all user-related HG services
-        ; uas = http://127.0.0.1:9000/
+    ; HG user domain, if you have one
+    ; this is the entry point for all user-related HG services
+    ; uas = http://127.0.0.1:9000/
 
 [MapImageService]
         ; Set this if you want to change the default