diff options
author | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
---|---|---|
committer | Justin Clark-Casey (justincc) | 2010-09-03 22:27:01 +0100 |
commit | 9b95bd259fa15157947326f044f63aedc248e73c (patch) | |
tree | b89733673d71a41529b40ea55f2e66d712991ecb /OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |
parent | minor: remove mono compiler warning (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.zip opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.gz opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.bz2 opensim-SC_OLD-9b95bd259fa15157947326f044f63aedc248e73c.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs index ca23e27..778f3f4 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianPresenceServiceConnector.cs | |||
@@ -103,24 +103,20 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
103 | 103 | ||
104 | public void Initialise(IConfigSource source) | 104 | public void Initialise(IConfigSource source) |
105 | { | 105 | { |
106 | if (Simian.IsSimianEnabled(source, "PresenceServices", this.Name)) | 106 | IConfig gridConfig = source.Configs["PresenceService"]; |
107 | if (gridConfig != null) | ||
107 | { | 108 | { |
108 | IConfig gridConfig = source.Configs["PresenceService"]; | ||
109 | if (gridConfig == null) | ||
110 | { | ||
111 | m_log.Error("[SIMIAN PRESENCE CONNECTOR]: PresenceService missing from OpenSim.ini"); | ||
112 | throw new Exception("Presence connector init error"); | ||
113 | } | ||
114 | |||
115 | string serviceUrl = gridConfig.GetString("PresenceServerURI"); | 109 | string serviceUrl = gridConfig.GetString("PresenceServerURI"); |
116 | if (String.IsNullOrEmpty(serviceUrl)) | 110 | if (!String.IsNullOrEmpty(serviceUrl)) |
117 | { | 111 | { |
118 | m_log.Error("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI in section PresenceService"); | 112 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
119 | throw new Exception("Presence connector init error"); | 113 | serviceUrl = serviceUrl + '/'; |
114 | m_serverUrl = serviceUrl; | ||
120 | } | 115 | } |
121 | |||
122 | m_serverUrl = serviceUrl; | ||
123 | } | 116 | } |
117 | |||
118 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
119 | m_log.Info("[SIMIAN PRESENCE CONNECTOR]: No PresenceServerURI specified, disabling connector"); | ||
124 | } | 120 | } |
125 | 121 | ||
126 | #region IPresenceService | 122 | #region IPresenceService |