diff options
author | Justin Clarke Casey | 2008-04-20 18:19:34 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-20 18:19:34 +0000 |
commit | d3cd2b0ae498b67718af05bd1b6186c68ad4234f (patch) | |
tree | b1eb883a217bf5675ee05bf13be2a67a2ec80a05 /OpenSim/Framework/Communications/LoginService.cs | |
parent | Removed some script engine noise from console (diff) | |
download | opensim-SC_OLD-d3cd2b0ae498b67718af05bd1b6186c68ad4234f.zip opensim-SC_OLD-d3cd2b0ae498b67718af05bd1b6186c68ad4234f.tar.gz opensim-SC_OLD-d3cd2b0ae498b67718af05bd1b6186c68ad4234f.tar.bz2 opensim-SC_OLD-d3cd2b0ae498b67718af05bd1b6186c68ad4234f.tar.xz |
* On grid mode, if the inventory service is responding but returning an empty response to a whole agent inventory request, then post an inventory login failure message.
IMO, this is better than allowing the agent to login with an apparantly blank inventory.
Diffstat (limited to 'OpenSim/Framework/Communications/LoginService.cs')
-rw-r--r-- | OpenSim/Framework/Communications/LoginService.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs index d610c51..ce8aa23 100644 --- a/OpenSim/Framework/Communications/LoginService.cs +++ b/OpenSim/Framework/Communications/LoginService.cs | |||
@@ -84,7 +84,7 @@ namespace OpenSim.Framework.UserManagement | |||
84 | /// </summary> | 84 | /// </summary> |
85 | /// <param name="userID"></param> | 85 | /// <param name="userID"></param> |
86 | /// <returns></returns> | 86 | /// <returns></returns> |
87 | /// <exception cref='System.Net.WebException'>This will be thrown if there is a problem with the inventory service</exception> | 87 | /// <exception cref='System.Exception'>This will be thrown if there is a problem with the inventory service</exception> |
88 | protected abstract InventoryData GetInventorySkeleton(LLUUID userID); | 88 | protected abstract InventoryData GetInventorySkeleton(LLUUID userID); |
89 | 89 | ||
90 | /// <summary> | 90 | /// <summary> |
@@ -218,7 +218,7 @@ namespace OpenSim.Framework.UserManagement | |||
218 | { | 218 | { |
219 | inventData = GetInventorySkeleton(agentID); | 219 | inventData = GetInventorySkeleton(agentID); |
220 | } | 220 | } |
221 | catch (System.Net.WebException e) | 221 | catch (Exception e) |
222 | { | 222 | { |
223 | m_log.ErrorFormat( | 223 | m_log.ErrorFormat( |
224 | "[LOGIN END]: Error retrieving inventory skeleton of agent {0}, {1} - {2}", | 224 | "[LOGIN END]: Error retrieving inventory skeleton of agent {0}, {1} - {2}", |