Merge branch 'master' into careminster-presence-refactor

18 files changed, 15 insertions, 24 deletions

diff --git a/bin/AprSharp.dll b/bin/AprSharp.dll
deleted file mode 100644
index b5035d5..0000000
--- a/bin/AprSharp.dll
+++ /dev/null
diff --git a/bin/AprSharp.pdb b/bin/AprSharp.pdb
deleted file mode 100644
index 67e0f07..0000000
--- a/bin/AprSharp.pdb
+++ /dev/null
diff --git a/bin/Mono.GetOptions.dll b/bin/Mono.GetOptions.dll
deleted file mode 100644
index f146ca6..0000000
--- a/bin/Mono.GetOptions.dll
+++ /dev/null
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example
index 988831f..7245bee 100644
--- a/bin/OpenSim.ini.example
+++ b/bin/OpenSim.ini.example
@@ -622,16 +622,21 @@
     ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
     ; Module = Default
 
+    ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
+    ; MessagingEnabled = true
 
-    ;; Service connectors to the Groups Service.  Select one depending on
-    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
+    ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
+    ; MessagingModule = GroupsMessagingModule
 
-    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
-    ;; The service connector to use for the GroupsModule
+    ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
+    ;; Service connectors to the Groups Service as used in the GroupsModule.  Select one depending on
+    ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
     ; ServicesConnectorModule = SimianGroupsServicesConnector
 
-    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI?} {}
+    ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
     ;; URI for the groups services
+    ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
+    ;; or http://mygridserver.com:82/Grid/ for SimianGrid
     ; GroupsServerURI = ""
 
     ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
@@ -641,13 +646,8 @@
     ;; 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
-
     ;; XmlRpc Security settings.  These must match those set on your backend
-    ;; groups service.
+    ;; groups service if the service is using these keys
     ; XmlRpcServiceReadKey    = 1234
     ; XmlRpcServiceWriteKey   = 1234
 
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9cfac98..8437ece 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -906,17 +906,6 @@
     PriceParcelRent = 1
 
 
-[SVN]
-    Enabled = false
-    Directory = SVNmodule\repo
-    URL = "svn://your.repo.here/"
-    Username = "user"
-    Password = "password"
-    ImportOnStartup = false
-    Autosave = false
-    AutoSavePeriod = 15 ; Number of minutes between autosave backups
-
-
 [XEngine]
     ; Enable this engine in this OpenSim instance
     Enabled = true
@@ -1115,10 +1104,12 @@
     ; May represent a security risk if you disable this.
     OwnerOnly = true
 
+
 [Hypergrid]
     ; Keep it false for now. Making it true requires the use of a special client in order to access inventory
     safemode = false
 
+
 [VivoxVoice]
     ; The VivoxVoice module will allow you to provide voice on your
     ; region(s). It uses the same voice technology as the LL grid and
@@ -1177,6 +1168,7 @@
     ; - a value between 0 and 160, default is 10
     ;vivox_channel_clamping_distance = 10
 
+
 [Groups]
     Enabled = false
 
@@ -1208,7 +1200,7 @@
     ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
     ;GroupsServerURI        = http://yourxmlrpcserver.com/xmlrpc.php
 
-    ; XmlRpc Security settings.  These must match those set on your backend groups service.
+    ; XmlRpc Security settings.  These must match those set on your backend groups service if the service is using these keys
     ;XmlRpcServiceReadKey    = 1234 
     ;XmlRpcServiceWriteKey   = 1234 
 
@@ -1268,4 +1260,3 @@
 
 [Modules]
     Include-modules = "addon-modules/*/config/*.ini"
-
diff --git a/bin/SubversionSharp.dll b/bin/SubversionSharp.dll
deleted file mode 100644
index 944de1d..0000000
--- a/bin/SubversionSharp.dll
+++ /dev/null
diff --git a/bin/SubversionSharp.pdb b/bin/SubversionSharp.pdb
deleted file mode 100644
index 19e54ae..0000000
--- a/bin/SubversionSharp.pdb
+++ /dev/null
diff --git a/bin/intl3_svn.dll b/bin/intl3_svn.dll
deleted file mode 100644
index 527d8e9..0000000
--- a/bin/intl3_svn.dll
+++ /dev/null
diff --git a/bin/libapr.dll b/bin/libapr.dll
deleted file mode 100644
index c22746a..0000000
--- a/bin/libapr.dll
+++ /dev/null
diff --git a/bin/libapr.pdb b/bin/libapr.pdb
deleted file mode 100644
index 2e5ae0c..0000000
--- a/bin/libapr.pdb
+++ /dev/null
diff --git a/bin/libapriconv.dll b/bin/libapriconv.dll
deleted file mode 100644
index fc95a51..0000000
--- a/bin/libapriconv.dll
+++ /dev/null
diff --git a/bin/libapriconv.pdb b/bin/libapriconv.pdb
deleted file mode 100644
index 0e92adc..0000000
--- a/bin/libapriconv.pdb
+++ /dev/null
diff --git a/bin/libaprutil.dll b/bin/libaprutil.dll
deleted file mode 100644
index 2e2a0c1..0000000
--- a/bin/libaprutil.dll
+++ /dev/null
diff --git a/bin/libaprutil.pdb b/bin/libaprutil.pdb
deleted file mode 100644
index de862ef..0000000
--- a/bin/libaprutil.pdb
+++ /dev/null
diff --git a/bin/libdb44d.dll b/bin/libdb44d.dll
deleted file mode 100644
index 0b975b7..0000000
--- a/bin/libdb44d.dll
+++ /dev/null
diff --git a/bin/libeay32.dll b/bin/libeay32.dll
deleted file mode 100644
index 3eacd76..0000000
--- a/bin/libeay32.dll
+++ /dev/null
diff --git a/bin/ssleay32.dll b/bin/ssleay32.dll
deleted file mode 100644
index e852b1b..0000000
--- a/bin/ssleay32.dll
+++ /dev/null
diff --git a/bin/svn_client-1.dll b/bin/svn_client-1.dll
deleted file mode 100644
index f258bc6..0000000
--- a/bin/svn_client-1.dll
+++ /dev/null