diff options
| author | Diva Canto | 2013-02-25 16:27:41 -0800 |
|---|---|---|
| committer | Diva Canto | 2013-02-25 16:27:41 -0800 |
| commit | 00da59ae52e2a7f205376e7cc2e450e94e13754b (patch) | |
| tree | e0b95787f4403d41fe817feb12c876e50bcc8153 /OpenSim/Addons | |
| parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
| download | opensim-SC_OLD-00da59ae52e2a7f205376e7cc2e450e94e13754b.zip opensim-SC_OLD-00da59ae52e2a7f205376e7cc2e450e94e13754b.tar.gz opensim-SC_OLD-00da59ae52e2a7f205376e7cc2e450e94e13754b.tar.bz2 opensim-SC_OLD-00da59ae52e2a7f205376e7cc2e450e94e13754b.tar.xz | |
Mantis #6552 -- stricter error (crash) if server URL is malformed.
Diffstat (limited to 'OpenSim/Addons')
| -rw-r--r-- | OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs index 628ce4d..f1cf66c 100644 --- a/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs +++ b/OpenSim/Addons/Groups/Remote/GroupsServiceRemoteConnectorModule.cs | |||
| @@ -74,11 +74,8 @@ namespace OpenSim.Groups | |||
| 74 | { | 74 | { |
| 75 | IConfig groupsConfig = config.Configs["Groups"]; | 75 | IConfig groupsConfig = config.Configs["Groups"]; |
| 76 | string url = groupsConfig.GetString("GroupsServerURI", string.Empty); | 76 | string url = groupsConfig.GetString("GroupsServerURI", string.Empty); |
| 77 | if (url == string.Empty) | 77 | if (!Uri.IsWellFormedUriString(url, UriKind.Absolute)) |
| 78 | { | 78 | throw new Exception(string.Format("[Groups.RemoteConnector]: Malformed groups server URL {0}. Fix it or disable the Groups feature.", url)); |
| 79 | m_log.WarnFormat("[Groups.RemoteConnector]: Groups server URL not provided. Groups will not work."); | ||
| 80 | return; | ||
| 81 | } | ||
| 82 | 79 | ||
| 83 | m_GroupsService = new GroupsServiceRemoteConnector(url); | 80 | m_GroupsService = new GroupsServiceRemoteConnector(url); |
| 84 | m_Scenes = new List<Scene>(); | 81 | m_Scenes = new List<Scene>(); |