diff options
| author | Justin Clark-Casey (justincc) | 2014-05-06 17:22:47 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2014-05-06 17:22:47 +0100 |
| commit | 95eeb4dde840a8b0d325dd0423dc7099aaed7dfa (patch) | |
| tree | 139e7fd30e49d13cdb5c53ebcf82eb5cc22cc8e9 /bin/OpenSim.ini.example | |
| parent | minor: Comment out Cacheitems debug log lines for now (diff) | |
| parent | Better error handling in AssetServerPostHandler. Invalid XML causes an Invali... (diff) | |
| download | opensim-SC_OLD-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.zip opensim-SC_OLD-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.gz opensim-SC_OLD-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.bz2 opensim-SC_OLD-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
| -rw-r--r-- | bin/OpenSim.ini.example | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/bin/OpenSim.ini.example b/bin/OpenSim.ini.example index 1395d72..8742313 100644 --- a/bin/OpenSim.ini.example +++ b/bin/OpenSim.ini.example | |||
| @@ -996,6 +996,10 @@ | |||
| 996 | ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote | 996 | ;; Used for V2 in HG only. If standalone, set this to local; if grided sim, set this to remote |
| 997 | ; LocalService = local | 997 | ; LocalService = local |
| 998 | 998 | ||
| 999 | ;# {SecretKey} {ServicesConnectorModule:Groups Remote Service Connector} {Secret key between sim and remote group service} {} "" | ||
| 1000 | ;; Used for V2 in Remote only. | ||
| 1001 | ; SecretKey = "" | ||
| 1002 | |||
| 999 | ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {} | 1003 | ;# {GroupsServerURI} {Module:GroupsModule (ServicesConnectorModule:Groups Remote Service Connector or (ServicesConnectorModule:Groups HG Service Connector and LocalService:remote))} {Groups Server URI} {} |
| 1000 | ;; URI for the groups services of this grid | 1004 | ;; URI for the groups services of this grid |
| 1001 | ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc | 1005 | ;; e.g. http://yourxmlrpcserver.com/xmlrpc.php for Flotsam XmlRpc |