diff options
author | Melanie | 2013-09-16 22:32:53 +0100 |
---|---|---|
committer | Melanie | 2013-09-16 22:32:53 +0100 |
commit | 72206a0e294865bf0c93ea16910276a188d51ce6 (patch) | |
tree | f7769826d78863b2e0e416fe529f0c55065e0acd /OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |
parent | Merge branch 'master' into careminster (diff) | |
parent | Mono 2.0 fix - call ToArray() explicitly (diff) | |
download | opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.zip opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.gz opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.bz2 opensim-SC_OLD-72206a0e294865bf0c93ea16910276a188d51ce6.tar.xz |
Merge branch 'avination-current' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
Diffstat (limited to 'OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs')
-rw-r--r-- | OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs index 3e06cf0..bf0cc35 100644 --- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs +++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs | |||
@@ -143,7 +143,13 @@ namespace OpenSim.Services.Connectors | |||
143 | 143 | ||
144 | string prefix = id.Substring(0, 2).ToLower(); | 144 | string prefix = id.Substring(0, 2).ToLower(); |
145 | 145 | ||
146 | string host = m_UriMap[prefix]; | 146 | string host; |
147 | |||
148 | // HG URLs will not be valid UUIDS | ||
149 | if (m_UriMap.ContainsKey(prefix)) | ||
150 | host = m_UriMap[prefix]; | ||
151 | else | ||
152 | host = m_UriMap["00"]; | ||
147 | 153 | ||
148 | serverUri.Host = host; | 154 | serverUri.Host = host; |
149 | 155 | ||