3 files changed, 26 insertions, 15 deletions

diff --git a/bin/Ode.NET.dll.config b/bin/Ode.NET.dll.config
index 58aad3f..f8f071e 100644
--- a/bin/Ode.NET.dll.config
+++ b/bin/Ode.NET.dll.config
@@ -2,4 +2,6 @@
   <dllmap os="osx" dll="ode" target="libode.dylib" />
   <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="ode" target="libode-x86_64" />
   <dllmap os="!windows,osx" cpu="x86" dll="ode" target="libode" />
+  <dllmap os="!windows,osx" cpu="ppc64" dll="ode" target="libode-ppc64" />
+  <dllmap os="!windows,osx" cpu="s390x" dll="ode" target="libode-s390x" />
 </configuration>
\ No newline at end of file
diff --git a/bin/OpenMetaverse.dll.config b/bin/OpenMetaverse.dll.config
index 356b6a7..489ee6b 100644
--- a/bin/OpenMetaverse.dll.config
+++ b/bin/OpenMetaverse.dll.config
@@ -2,4 +2,6 @@
     <dllmap os="osx" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1.dylib" />
     <dllmap os="!windows,osx" cpu="x86-64,ia64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-x86_64" />
     <dllmap os="!windows,osx" cpu="x86" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1" />
+    <dllmap os="!windows,osx" cpu="s390x" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-s390x" />
+    <dllmap os="!windows,osx" cpu="ppc64" dll="openjpeg-dotnet.dll" target="libopenjpeg-dotnet-2.1.3.0-dotnet-1-ppc64" />
 </configuration>
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index bd03652..ff8fa5f 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1271,21 +1271,28 @@
     ; 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/
     ;
-    ;Module  = XmlRpcGroups
-
-    ;XmlRpcServiceURL       = http://yourxmlrpcserver.com/xmlrpc.php
-    ;XmlRpcServiceReadKey = 1234
-    ;XmlRpcServiceWriteKey = 1234
-
-    ;XmlRpcMessagingEnabled = true
-    ;XmlRpcNoticesEnabled   = true
-
-    ; This makes the XmlRpcGroups modules very chatty on the console.
-    ;XmlRpcDebugEnabled     = true
-
-    ; Disables HTTP Keep-Alive for Groups Module HTTP Requests, work around for
-    ; a problem discovered on some Windows based region servers.  Only disable
-    ; if you see a large number (dozens) of the following Exceptions:
+    ;Module  = GroupsModule
+    
+    ; Enable Group Notices
+        ;NoticesEnabled   = true
+
+    ; This makes the Groups modules very chatty on the console.
+    ;DebugEnabled     = true
+
+    ; 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]
+    ; XmlRpc Service Connector to the Flotsam XmlRpc Groups Service Implementation
+    ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
+    ;XmlRpcServiceURL        = http://yourxmlrpcserver.com/xmlrpc.php
+    ;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