aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
diff options
context:
space:
mode:
authorDiva Canto2013-07-02 13:29:44 -0700
committerDiva Canto2013-07-02 13:29:44 -0700
commitccca0059695e0321ae1aa223c9e8b89cc141b58f (patch)
treec98e90afa1b931f01729d0b9feccb1dc861def45 /OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
parentUpdate debug unknown user name UserUMMTGUN3 to UserUMMTGUN4 and UserUMMAU -> ... (diff)
downloadopensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.zip
opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.gz
opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.bz2
opensim-SC_OLD-ccca0059695e0321ae1aa223c9e8b89cc141b58f.tar.xz
HG: close a loophole by which if something was wrong with the ServiceURLs it resulted in never ending asset requests
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs')
-rw-r--r--OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
index b2b628d..64d5f61 100644
--- a/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/InventoryAccess/HGInventoryAccessModule.cs
@@ -297,7 +297,7 @@ namespace OpenSim.Region.CoreModules.Framework.InventoryAccess
297 if (m_Scene.TryGetScenePresence(userID, out sp)) 297 if (m_Scene.TryGetScenePresence(userID, out sp))
298 { 298 {
299 AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode); 299 AgentCircuitData aCircuit = m_Scene.AuthenticateHandler.GetAgentCircuitData(sp.ControllingClient.CircuitCode);
300 if (aCircuit.ServiceURLs.ContainsKey("AssetServerURI")) 300 if (aCircuit != null && aCircuit.ServiceURLs != null && aCircuit.ServiceURLs.ContainsKey("AssetServerURI"))
301 { 301 {
302 assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString(); 302 assetServerURL = aCircuit.ServiceURLs["AssetServerURI"].ToString();
303 assetServerURL = assetServerURL.Trim(new char[] { '/' }); 303 assetServerURL = assetServerURL.Trim(new char[] { '/' });