Merge branch 'master' into careminster

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

4 files changed, 21 insertions, 13 deletions

diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 6fb9787..babd0ec 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1129,7 +1129,7 @@
 
     ; Maximum number of llListen events we allow over the entire region.
     ; Set this to 0 to have no limit imposed
-    max_listeners_per_region = 1000
+    max_listens_per_region = 1000
 
     ; Maximum number of llListen events we allow per script
     ; Set this to 0 to have no limit imposed.
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 0eb8291..4ea5ffd 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -319,13 +319,13 @@ ServiceConnectors = "8003/OpenSim.Server.Handlers.dll:AssetServiceConnector,8003
     ; password help: optional: page providing password assistance for users of your grid
     ;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:8002/
+    ; 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:8002/
 
-        ; HG user domain, if you have one
-        ; this is the entry point for all user-related HG services
-        ; uas = http://127.0.0.1:8002/
+    ; HG user domain, if you have one
+    ; this is the entry point for all user-related HG services
+    ; uas = http://127.0.0.1:8002/
 
 [GatekeeperService]
     LocalServiceModule = "OpenSim.Services.HypergridService.dll:GatekeeperService"
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index fa6f525..8d7f6fc 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -137,6 +137,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;
+
 [UserAgentService]
     ;
     ; === HG ONLY ===
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