aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2010-12-17 21:19:57 +0000
committerJustin Clark-Casey (justincc)2010-12-17 21:19:57 +0000
commit19f70b93a06ca1f7be4097e1e0673ce6a0afe872 (patch)
tree4ac4052a5b50734d03dec966d3a510ebca259e18
parentPut in locks on m_killRecord to replace changed locks on m_entityUpdates.Sync... (diff)
downloadopensim-SC-19f70b93a06ca1f7be4097e1e0673ce6a0afe872.zip
opensim-SC-19f70b93a06ca1f7be4097e1e0673ce6a0afe872.tar.gz
opensim-SC-19f70b93a06ca1f7be4097e1e0673ce6a0afe872.tar.bz2
opensim-SC-19f70b93a06ca1f7be4097e1e0673ce6a0afe872.tar.xz
tidy up the [Groups] section in OpenSim.ini.example
-rw-r--r--bin/OpenSim.ini.example22
-rw-r--r--bin/OpenSimDefaults.ini2
2 files changed, 12 insertions, 12 deletions
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 @@
622 ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse 622 ;; or from the SimianGrid project at http://code.google.com/p/openmetaverse
623 ; Module = Default 623 ; Module = Default
624 624
625 ;# {MessagingEnabled} {Module:GroupsModule} {Is groups messaging enabled?} {true false} true
626 ; MessagingEnabled = true
625 627
626 ;; Service connectors to the Groups Service. Select one depending on 628 ;# {MessagingModule} {MessagingEnabled:true} {Module to use for groups messaging} {GroupsMessagingModule} GroupsMessagingModule
627 ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend 629 ; MessagingModule = GroupsMessagingModule
628 630
629 ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups?} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector 631 ;# {ServicesConnectorModule} {Module:GroupsModule} {Service connector to use for groups} {XmlRpcGroupsServicesConnector SimianGroupsServicesConnector} XmlRpcGroupsServicesConnector
630 ;; The service connector to use for the GroupsModule 632 ;; Service connectors to the Groups Service as used in the GroupsModule. Select one depending on
633 ;; whether you're using a Flotsam XmlRpc backend or a SimianGrid backend
631 ; ServicesConnectorModule = SimianGroupsServicesConnector 634 ; ServicesConnectorModule = SimianGroupsServicesConnector
632 635
633 ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI?} {} 636 ;# {GroupsServerURI} {Module:GroupsModule} {Groups Server URI} {}
634 ;; URI for the groups services 637 ;; URI for the groups services
638 ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc
639 ;; or http://mygridserver.com:82/Grid/ for SimianGrid
635 ; GroupsServerURI = "" 640 ; GroupsServerURI = ""
636 641
637 ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true 642 ;# {NoticesEnabled} {Module:GroupsModule} {Enable group notices?} {true false} true
@@ -641,13 +646,8 @@
641 ;; This makes the Groups modules very chatty on the console. 646 ;; This makes the Groups modules very chatty on the console.
642 ; DebugEnabled = false 647 ; DebugEnabled = false
643 648
644 ;; Specify which messaging module to use for groups messaging and if it's
645 ;; enabled
646 ; MessagingModule = GroupsMessagingModule
647 ; MessagingEnabled = true
648
649 ;; XmlRpc Security settings. These must match those set on your backend 649 ;; XmlRpc Security settings. These must match those set on your backend
650 ;; groups service. 650 ;; groups service if the service is using these keys
651 ; XmlRpcServiceReadKey = 1234 651 ; XmlRpcServiceReadKey = 1234
652 ; XmlRpcServiceWriteKey = 1234 652 ; XmlRpcServiceWriteKey = 1234
653 653
diff --git a/bin/OpenSimDefaults.ini b/bin/OpenSimDefaults.ini
index 9cfac98..36e0b7b 100644
--- a/bin/OpenSimDefaults.ini
+++ b/bin/OpenSimDefaults.ini
@@ -1208,7 +1208,7 @@
1208 ;ServicesConnectorModule = XmlRpcGroupsServicesConnector 1208 ;ServicesConnectorModule = XmlRpcGroupsServicesConnector
1209 ;GroupsServerURI = http://yourxmlrpcserver.com/xmlrpc.php 1209 ;GroupsServerURI = http://yourxmlrpcserver.com/xmlrpc.php
1210 1210
1211 ; XmlRpc Security settings. These must match those set on your backend groups service. 1211 ; XmlRpc Security settings. These must match those set on your backend groups service if the service is using these keys
1212 ;XmlRpcServiceReadKey = 1234 1212 ;XmlRpcServiceReadKey = 1234
1213 ;XmlRpcServiceWriteKey = 1234 1213 ;XmlRpcServiceWriteKey = 1234
1214 1214