From d3cd2b0ae498b67718af05bd1b6186c68ad4234f Mon Sep 17 00:00:00 2001 From: Justin Clarke Casey Date: Sun, 20 Apr 2008 18:19:34 +0000 Subject: * 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. --- OpenSim/Grid/UserServer/UserLoginService.cs | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'OpenSim/Grid/UserServer') diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs index d35a471..a3bc9f0 100644 --- a/OpenSim/Grid/UserServer/UserLoginService.cs +++ b/OpenSim/Grid/UserServer/UserLoginService.cs @@ -306,6 +306,7 @@ namespace OpenSim.Grid.UserServer "[LOGIN]: Contacting inventory service at {0} for inventory skeleton of agent {1}", m_config.InventoryUrl, userID); + List folders = SynchronousRestObjectPoster.BeginPostObject>( "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID); @@ -355,26 +356,9 @@ namespace OpenSim.Grid.UserServer } else { - m_log.Warn("[LOGIN]: The root inventory folder could still not be retrieved" + - " for user ID " + userID); - - AgentInventory userInventory = new AgentInventory(); - userInventory.CreateRootFolder(userID); - - ArrayList AgentInventoryArray = new ArrayList(); - Hashtable TempHash; - foreach (InventoryFolder InvFolder in userInventory.InventoryFolders.Values) - { - TempHash = new Hashtable(); - TempHash["name"] = InvFolder.FolderName; - TempHash["parent_id"] = InvFolder.ParentID.ToString(); - TempHash["version"] = (Int32) InvFolder.Version; - TempHash["type_default"] = (Int32) InvFolder.DefaultType; - TempHash["folder_id"] = InvFolder.FolderID.ToString(); - AgentInventoryArray.Add(TempHash); - } - - return new InventoryData(AgentInventoryArray, userInventory.InventoryRoot.FolderID); + throw new Exception( + String.Format( + "A root inventory folder for {0} could not be retrieved from the inventory service", userID)); } } } -- cgit v1.1