Merge branch '0.6.9-post-fixes' into careminster

2 files changed, 11 insertions, 13 deletions

diff --git a/bin/OpenSim.exe.config b/bin/OpenSim.exe.config
index 3c7adf5..aa2162e 100755
--- a/bin/OpenSim.exe.config
+++ b/bin/OpenSim.exe.config
@@ -13,6 +13,8 @@
     <appender name="Console" type="OpenSim.Framework.Console.OpenSimAppender, OpenSim.Framework.Console">
       <layout type="log4net.Layout.PatternLayout">
         <conversionPattern value="%date{HH:mm:ss} - %message" />
+        <!-- Use the line below instead of the one above if you want milliseconds in your log timestamps -->
+        <!-- <conversionPattern value="%date{HH:mm:ss,fff} - %message" /> -->
       </layout>
     </appender>
 
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 4a60f4b..526bae7 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1302,39 +1302,35 @@
 [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 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/
     ;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 
 
-    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service settings
+    ; Flotsam XmlRpc Service for Groups.  Uncomment these settings and change accordingly if you are using this backend groups service
     ;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