3 files changed, 41 insertions, 15 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 674a66c..cb978f1 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -931,33 +931,47 @@
     ;; Enables the groups module
     ; Enabled = false
 
-    ;# {Module} {Enabled:true} {Groups module to use? (Use GroupsModule to use Flotsam/Simian)} {} Default
-    ;; This is the current groups stub in Region.CoreModules.Avatar.Groups.
-    ;; All the other settings below only really apply to the Flotsam/SimianGrid
-    ;; GroupsModule.
-    ;; This module can use a PHP XmlRpc server from the Flotsam project at
+    ;# {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
     ;; http://code.google.com/p/flotsam/
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
+        ;; or... use Groups Module V2, which works for standalones and robust grids
+        ; Module = "Groups Module V2"
 
-    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
-    ; MessagingEnabled = true
-
-    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
-    ; MessagingModule = GroupsMessagingModule
+    ;# {StorageProvider} {Module:Groups Module V2} {The DLL that provides the storage for V2} {OpenSim.Data.MySQL.dll} 
+    ; StorageProvider = OpenSim.Data.MySQL.dll
 
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
+    ;# {ServicesConnectorModule} {Module:GroupsModule Module:Groups Module V2} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector "Groups Local Service Connector" "Groups Remote Service Connector" "Groups HG Service Connector"} XmlRpcGroupsServicesConnector
     ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
-    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend or several flavours of V2, Hypergrided or not, standalone or grided.
     ; ServicesConnectorModule = XmlRpcGroupsServicesConnector
 
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
-    ;; URI for the groups services
+    ;# {LocalService} {ServicesConnectorModule:Groups HG Service Connector} {Is the group service in this process or elsewhere?} {local remote} local
+        ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote
+    ; LocalService = local
+
+    ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {}
+    ;; URI for the groups services of this grid
     ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
     ;; or http://mygridserver.com:82/Grid/ for SimianGrid
+        ;; or http:://mygridserver.com:8003 for robust, V2
     ; GroupsServerURI = ""
 
-    ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
+    ;# {HomeURI} {ServicesConnectorModule:Groups HG Service Connector} {What's the home address of this world?} {} 
+        ;; Used for V2 in HG only. For example
+        ;; http://mygridserver.com:9000 or http://mygridserver.com:8002
+    ; HomeURI = "" 
+
+    ;# {MessagingEnabled} {Module:GroupsModule Module:Groups Module V2} {Is groups messaging enabled?} {true false} true
+    ; MessagingEnabled = true
+
+    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule "Groups Messaging Module V2"} GroupsMessagingModule
+    ; MessagingModule = GroupsMessagingModule
+        ;; or use V2 for Groups V2
+        ; MessagingModule = "Groups Messaging Module V2"
+
+    ;# {NoticesEnabled} {Module:GroupsModule Module:Groups Module V2} {Enable group notices?} {true false} true
     ;; Enable Group Notices
     ; NoticesEnabled = true
 
diff --git a/bin/Robust.HG.ini.example b/bin/Robust.HG.ini.example
index 020815e..f249dd2 100644
--- a/bin/Robust.HG.ini.example
+++ b/bin/Robust.HG.ini.example
@@ -53,6 +53,8 @@ MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnecto
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 ;; Uncomment this if you want offline IM to work
 ;OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+;; Uncomment this if you want Groups V2 to work
+;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
 
 ;; Additions for Hypergrid
 
@@ -63,6 +65,8 @@ HGFriendsServerConnector = "8002/OpenSim.Server.Handlers.dll:HGFriendsServerConn
 InstantMessageServerConnector = "8002/OpenSim.Server.Handlers.dll:InstantMessageServerConnector"
 HGInventoryServiceConnector = "HGInventoryService@8002/OpenSim.Server.Handlers.dll:XInventoryInConnector"
 HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:AssetServiceConnector"
+;; Uncomment this if you want Groups V2, HG to work
+;HGGroupsServiceConnector = "8002/Diva.Groups.dll:HGGroupsServiceRobustConnector"
 
 ;; Additions for other add-on modules. For example:
 ;; WifiServerConnector = "8002/Diva.Wifi.dll:WifiServerConnector"
@@ -550,3 +554,9 @@ HGAssetServiceConnector = "HGAssetService@8002/OpenSim.Server.Handlers.dll:Asset
     ; OfflineIM
     OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
 
+[Groups]
+    ;; for the HG Groups service
+    OfflineIMService = "OpenSim.Addons.OfflineIM.dll:OfflineIMService"
+    ; What is the HomeURI of users associated with this grid?
+    HomeURI = "http://127.0.0.1:8002"
+    UserAccountService = "OpenSim.Services.UserAccountService.dll:UserAccountService"
diff --git a/bin/Robust.ini.example b/bin/Robust.ini.example
index 63a5699..eee313a 100644
--- a/bin/Robust.ini.example
+++ b/bin/Robust.ini.example
@@ -45,6 +45,8 @@ MapAddServiceConnector = "8003/OpenSim.Server.Handlers.dll:MapAddServiceConnecto
 MapGetServiceConnector = "8002/OpenSim.Server.Handlers.dll:MapGetServiceConnector"
 ;; Uncomment this if you want offline IM to work
 ;OfflineIMServiceConnector = "8003/OpenSim.Addons.OfflineIM.dll:OfflineIMServiceRobustConnector"
+;; Uncomment this if you want Groups V2 to work
+;GroupsServiceConnector = "8003/OpenSim.Addons.Groups.dll:GroupsServiceRobustConnector"
 
 
 ; * This is common for all services, it's the network setup for the entire