aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorUbitUmarov2015-09-15 21:33:26 +0100
committerUbitUmarov2015-09-15 21:33:26 +0100
commit19c5f9ce1d42d27c92de8ccd6c3ba679601ec258 (patch)
treef70444d271d0d561b74eb02f5c7b55e929495173 /OpenSim
parenttemporary reduce maxwearables, so teleport testing can be performed before ot... (diff)
downloadopensim-SC_OLD-19c5f9ce1d42d27c92de8ccd6c3ba679601ec258.zip
opensim-SC_OLD-19c5f9ce1d42d27c92de8ccd6c3ba679601ec258.tar.gz
opensim-SC_OLD-19c5f9ce1d42d27c92de8ccd6c3ba679601ec258.tar.bz2
opensim-SC_OLD-19c5f9ce1d42d27c92de8ccd6c3ba679601ec258.tar.xz
fix bad side efects of missing avination optional configuration
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs27
1 files changed, 16 insertions, 11 deletions
diff --git a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
index 8529f92..ea506c8 100644
--- a/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
+++ b/OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
@@ -139,6 +139,9 @@ namespace OpenSim.Services.Connectors
139 139
140 private string MapServer(string id) 140 private string MapServer(string id)
141 { 141 {
142 if (m_UriMap.Count == 0)
143 return m_ServerURI;
144
142 UriBuilder serverUri = new UriBuilder(m_ServerURI); 145 UriBuilder serverUri = new UriBuilder(m_ServerURI);
143 146
144 string prefix = id.Substring(0, 2).ToLower(); 147 string prefix = id.Substring(0, 2).ToLower();
@@ -164,7 +167,9 @@ namespace OpenSim.Services.Connectors
164 protected void retryCheck(object source, ElapsedEventArgs e) 167 protected void retryCheck(object source, ElapsedEventArgs e)
165 { 168 {
166 m_retryCounter++; 169 m_retryCounter++;
167 if (m_retryCounter > 60) m_retryCounter -= 60; 170 if (m_retryCounter > 60)
171 m_retryCounter -= 60;
172
168 List<int> keys = new List<int>(); 173 List<int> keys = new List<int>();
169 foreach (int a in m_retryQueue.Keys) 174 foreach (int a in m_retryQueue.Keys)
170 { 175 {
@@ -282,19 +287,19 @@ namespace OpenSim.Services.Connectors
282 287
283 rc.RequestMethod = "GET"; 288 rc.RequestMethod = "GET";
284 289
285 Stream s = rc.Request(m_Auth); 290 using (Stream s = rc.Request(m_Auth))
286
287 if (s == null)
288 return null;
289
290 if (s.Length > 0)
291 { 291 {
292 byte[] ret = new byte[s.Length]; 292 if (s == null)
293 s.Read(ret, 0, (int)s.Length); 293 return null;
294 294
295 return ret; 295 if (s.Length > 0)
296 } 296 {
297 byte[] ret = new byte[s.Length];
298 s.Read(ret, 0, (int)s.Length);
297 299
300 return ret;
301 }
302 }
298 return null; 303 return null;
299 } 304 }
300 } 305 }