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 /OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | |
| 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-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.zip opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.gz opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.bz2 opensim-SC-95eeb4dde840a8b0d325dd0423dc7099aaed7dfa.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs')
| -rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs index d3de0e8..5fb3c19 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | |||
| @@ -77,7 +77,8 @@ namespace OpenSim.Groups | |||
| 77 | if (!Uri.IsWellFormedUriString(url, UriKind.Absolute)) | 77 | if (!Uri.IsWellFormedUriString(url, UriKind.Absolute)) |
| 78 | throw new Exception(string.Format("[Groups.RemoteConnector]: Malformed groups server URL {0}. Fix it or disable the Groups feature.", url)); | 78 | throw new Exception(string.Format("[Groups.RemoteConnector]: Malformed groups server URL {0}. Fix it or disable the Groups feature.", url)); |
| 79 | 79 | ||
| 80 | m_GroupsService = new GroupsServiceRemoteConnector(url); | 80 | string secret = groupsConfig.GetString("SecretKey", string.Empty); |
| 81 | m_GroupsService = new GroupsServiceRemoteConnector(url, secret); | ||
| 81 | m_Scenes = new List<Scene>(); | 82 | m_Scenes = new List<Scene>(); |
| 82 | 83 | ||
| 83 | } | 84 | } |