Merge branch 'master' into careminster

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

6 files changed, 14 insertions, 4 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 992838f..d498258 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -575,9 +575,9 @@
     ;; must be set to allow offline messaging to work.
     ; MuteListURL = http://yourserver/Mute.php
 
-    ;; Control whether group messages are forwarded to offline users.
+    ;; Control whether group invites and notices are stored for offline users.
     ;; Default is true.
-    ;; This applies to the core groups module (Flotsam) only.
+    ;; This applies to both core groups module.
     ; ForwardOfflineGroupMessages = true
 
 
@@ -953,7 +953,7 @@
 
     ;# {LevelGroupCreate} {Enabled:true} {User level for creating groups} {} 0
     ;; Minimum user level required to create groups
-    ;LevelGroupCreate = 0
+    ; LevelGroupCreate = 0
 
     ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {Default "Groups Module V2"} Default
     ;; The default module can use a PHP XmlRpc server from the Flotsam project at
@@ -1006,6 +1006,12 @@
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
+    ;# {MessageOnlineUsersOnly} {Module:GroupsModule Module} {Message online users only?} {true false} false
+    ; Experimental option to only message online users rather than all users
+    ; Should make large groups with few online members messaging faster, as the expense of more calls to presence service
+    ; Applies Flotsam Group only. V2 has this always on, no other option
+    ; MessageOnlineUsersOnly = false
+
     ;; This makes the Groups modules very chatty on the console.
     ; DebugEnabled = false
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 57bc79e..c9a79fc 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1612,7 +1612,7 @@
 
     ; Experimental option to only message cached online users rather than all users
     ; Should make large group with few online members messaging faster, as the expense of more calls to ROBUST presence service
-    ; This currently only applies to the Flotsam XmlRpc backend
+        ; (Flotsam groups only; in V2 this is always on)
     MessageOnlineUsersOnly = false
 
     ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
diff --git a/bin/config-include/Grid.ini b/bin/config-include/Grid.ini
index cb3a5c8..15ba55a 100644
--- a/bin/config-include/Grid.ini
+++ b/bin/config-include/Grid.ini
@@ -23,6 +23,7 @@
     InventoryAccessModule       = "BasicInventoryAccessModule"
     LandServices            = "RemoteLandServicesConnector"
         MapImageService                 = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/GridHypergrid.ini b/bin/config-include/GridHypergrid.ini
index 31a4059..7edcafb 100644
--- a/bin/config-include/GridHypergrid.ini
+++ b/bin/config-include/GridHypergrid.ini
@@ -28,6 +28,7 @@
         FriendsModule                   = "HGFriendsModule"
         MapImageService                 = "MapImageServiceModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     LandServiceInConnector                      = true
     NeighbourServiceInConnector         = true
diff --git a/bin/config-include/Standalone.ini b/bin/config-include/Standalone.ini
index ba72fe7..d3b9cb4 100644
--- a/bin/config-include/Standalone.ini
+++ b/bin/config-include/Standalone.ini
@@ -19,6 +19,7 @@
     EntityTransferModule    = "BasicEntityTransferModule"
     InventoryAccessModule   = "BasicInventoryAccessModule"
     MapImageService                     = "MapImageServiceModule"
+        SearchModule                    = "BasicSearchModule"
 
     LibraryModule              = true
     LLLoginServiceInConnector  = true
diff --git a/bin/config-include/StandaloneHypergrid.ini b/bin/config-include/StandaloneHypergrid.ini
index 39c33e8..3abf49b 100644
--- a/bin/config-include/StandaloneHypergrid.ini
+++ b/bin/config-include/StandaloneHypergrid.ini
@@ -25,6 +25,7 @@
     InventoryAccessModule       = "HGInventoryAccessModule"
     FriendsModule                       = "HGFriendsModule"
         UserManagementModule    = "HGUserManagementModule"
+        SearchModule                    = "BasicSearchModule"
     
     InventoryServiceInConnector                 = true
     AssetServiceInConnector                             = true