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/SimianAssetServiceConnector.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 'OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs index 616b5a7..3a4f84f 100644 --- a/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs +++ b/OpenSim/Services/Connectors/SimianGrid/SimianAssetServiceConnector.cs | |||
@@ -85,27 +85,20 @@ namespace OpenSim.Services.Connectors.SimianGrid | |||
85 | 85 | ||
86 | public void Initialise(IConfigSource source) | 86 | public void Initialise(IConfigSource source) |
87 | { | 87 | { |
88 | if (Simian.IsSimianEnabled(source, "AssetServices", this.Name)) | 88 | IConfig gridConfig = source.Configs["AssetService"]; |
89 | if (gridConfig != null) | ||
89 | { | 90 | { |
90 | IConfig gridConfig = source.Configs["AssetService"]; | ||
91 | if (gridConfig == null) | ||
92 | { | ||
93 | m_log.Error("[SIMIAN ASSET CONNECTOR]: AssetService missing from OpenSim.ini"); | ||
94 | throw new Exception("Asset connector init error"); | ||
95 | } | ||
96 | |||
97 | string serviceUrl = gridConfig.GetString("AssetServerURI"); | 91 | string serviceUrl = gridConfig.GetString("AssetServerURI"); |
98 | if (String.IsNullOrEmpty(serviceUrl)) | 92 | if (!String.IsNullOrEmpty(serviceUrl)) |
99 | { | 93 | { |
100 | m_log.Error("[SIMIAN ASSET CONNECTOR]: No AssetServerURI in section AssetService"); | 94 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) |
101 | throw new Exception("Asset connector init error"); | 95 | serviceUrl = serviceUrl + '/'; |
96 | m_serverUrl = serviceUrl; | ||
102 | } | 97 | } |
103 | |||
104 | if (!serviceUrl.EndsWith("/") && !serviceUrl.EndsWith("=")) | ||
105 | serviceUrl = serviceUrl + '/'; | ||
106 | |||
107 | m_serverUrl = serviceUrl; | ||
108 | } | 98 | } |
99 | |||
100 | if (String.IsNullOrEmpty(m_serverUrl)) | ||
101 | m_log.Info("[SIMIAN ASSET CONNECTOR]: No AssetServerURI specified, disabling connector"); | ||
109 | } | 102 | } |
110 | 103 | ||
111 | #region IAssetService | 104 | #region IAssetService |