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

2 files changed, 8 insertions, 2 deletions

diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 7f2cba6..f3cd603 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -1033,9 +1033,12 @@
     ; Applies Flotsam Group only. V2 has this always on, no other option
     ; MessageOnlineUsersOnly = false
 
-    ;; This makes the Groups modules very chatty on the console.
+    ;; This makes the Group module very chatty on the console.
     ; DebugEnabled = false
 
+    ; This makes the Group Messaging module very chatty on the console.
+    ; DebugMessagingEnabled = false
+
     ;; XmlRpc Security settings.  These must match those set on your backend
     ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index cae2958..fd6e8b7 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1661,9 +1661,12 @@
     ; Enable Group Notices
     ;NoticesEnabled   = true 
 
-    ; This makes the Groups modules very chatty on the console.
+    ; This makes the Group module very chatty on the console.
     DebugEnabled     = false
 
+    ; This makes the Groups Messaging module very chatty on the console.
+    DebugMessagingEnabled = false
+
     ; Groups data is cached for this number of seconds before another request is made to the groups service
     ; Set to 0 to disable the cache.
     ; Default is 30 seconds