Merge branch 'master' into careminster-presence-refactor

3 files changed, 27 insertions, 3 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 9b0c09b..fd81b39 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1182,10 +1182,18 @@
     ;MessagingModule = GroupsMessagingModule
     ;MessagingEnabled = true
 
-    ; Service connector to Groups Service [Select One]
-    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
+    ; Service connector to Groups Service [Select One] ServicesConnectorModule
+
+        
+    ; Simian Grid Service for Groups
+    ;ServicesConnectorModule = SimianGroupsServicesConnector
+    ;GroupsServerURI = http://mygridserver.com:82/Grid/
+
+    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service settings
     ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
-    ;XmlRpcServiceURL        = http://yourxmlrpcserver.com/xmlrpc.php
+    ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
+
+    ; XmlRpc Service Settings
     ;XmlRpcServiceReadKey    = 1234
     ;XmlRpcServiceWriteKey   = 1234
 
diff --git a/bin/config-include/GridCommon.ini.example b/bin/config-include/GridCommon.ini.example
index 4717561..6e27694 100644
--- a/bin/config-include/GridCommon.ini.example
+++ b/bin/config-include/GridCommon.ini.example
@@ -52,6 +52,12 @@
     ;
     FriendsServerURI = "http://mygridserver.com:8003"
 
+[Groups]
+    ;
+    ; change this to your grid-wide groups server
+    ;
+    GroupsServerURI = "http://mygridserver.com:82/Grid/"
+
 
 [Modules]
     ;; Choose 0 or 1 cache modules, and the corresponding config file, if it exists.
diff --git a/bin/config-include/SimianGrid.ini b/bin/config-include/SimianGrid.ini
index 064f36e..41deb92 100644
--- a/bin/config-include/SimianGrid.ini
+++ b/bin/config-include/SimianGrid.ini
@@ -15,6 +15,7 @@
 ; UserAccountServerURI = "http://www.mygrid.com/Grid/"
 ; AuthenticationServerURI = "http://www.mygrid.com/Grid/"
 ; FriendsServerURI = "http://www.mygrid.com/Grid/"
+; GroupsServerURI = "http://www.mygrid.com/Grid/"
 
 [Includes]
     Include-Common = "config-include/GridCommon.ini"
@@ -55,3 +56,12 @@
 [AssetService]
     DefaultAssetLoader = "OpenSim.Framework.AssetLoader.Filesystem.dll"
     AssetLoaderArgs = "assets/AssetSets.xml"
+        
+[Groups]
+    Enabled = true
+    Module  = GroupsModule
+    DebugEnabled     = false
+    NoticesEnabled   = true
+    MessagingModule = GroupsMessagingModule
+    MessagingEnabled = true
+    ServicesConnectorModule = SimianGroupsServicesConnector