Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim

1 files changed, 13 insertions, 15 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 2a70e96..38febc2 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1171,44 +1171,42 @@
 [Groups]
     Enabled = false
 
-    ; This is the current groups stub in Region.CoreModules.Avatar.Groups
+    ; This is the current groups stub in Region.CoreModules.Avatar.Groups.  All the other settings below only really
+    ; apply to the Flotsam/SimianGrid GroupsModule
     Module  = Default
 
-    ; The PHP code for the server is available from the Flotsam project for you to deploy
-    ; to your own server.  The Flotsam project is located at http://code.google.com/p/flotsam/
-    ;
+    ; This 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  = GroupsModule
 
     ; Enable Group Notices
-    ;NoticesEnabled   = true
+    ;NoticesEnabled   = true 
 
     ; This makes the Groups modules very chatty on the console.
     DebugEnabled     = false
 
     ; Specify which messaging module to use for groups messaging and if it's enabled
     ;MessagingModule = GroupsMessagingModule
-    ;MessagingEnabled = true
-
-    ; Service connector to Groups Service [Select One] ServicesConnectorModule
+    ;MessagingEnabled = true 
 
-        
-    ; Simian Grid Service for Groups
+    ; Service connectors to the Groups Service.  Select one depending on whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+  
+    ; SimianGrid Service for Groups
     ;ServicesConnectorModule = SimianGroupsServicesConnector
     ;GroupsServerURI = http://mygridserver.com:82/Grid/
 
-    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service settings
+    ; Flotsam XmlRpc Service for Groups
     ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
     ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
 
-    ; XmlRpc Service Settings
-    ;XmlRpcServiceReadKey    = 1234
-    ;XmlRpcServiceWriteKey   = 1234
+    ; XmlRpc Security settings.  These must match those set on your backend groups service.
+    ;XmlRpcServiceReadKey    = 1234 
+    ;XmlRpcServiceWriteKey   = 1234 
 
     ; Disables HTTP Keep-Alive for XmlRpcGroupsServicesConnector HTTP Requests,
     ; this is a work around fora problem discovered on some Windows based region servers.
     ; Only disable keep alive if you see a large number (dozens) of the following Exceptions:
     ; System.Net.WebException: The request was aborted: The request was canceled.
-    ;
     ; XmlRpcDisableKeepAlive = false