3 files changed, 43 insertions, 13 deletions

diff --git a/OpenSim/Framework/Communications/LoginResponse.cs b/OpenSim/Framework/Communications/LoginResponse.cs
index 763274a..53ec796 100644
--- a/OpenSim/Framework/Communications/LoginResponse.cs
+++ b/OpenSim/Framework/Communications/LoginResponse.cs
@@ -238,6 +238,19 @@ namespace OpenSim.Framework.UserManagement
                 "Could not authenticate your avatar. Please check your username and password, and check the grid if problems persist.",
                 "false");
         }
+        
+        /// <summary>
+        /// Response to indicate that login failed because the agent's inventory was not available.
+        /// </summary>
+        /// <returns></returns>
+        public XmlRpcResponse CreateLoginInventoryFailedResponse()
+        {
+            return GenerateFailureResponse(
+                "key",
+                "The agent inventory service is not responding.  Please notify the grid operator if this is a grid sim,"
+                    + " or the sim operator if this is a standalone sim.",
+                "false");     
+        }
 
         public XmlRpcResponse CreateAlreadyLoggedInResponse()
         {
diff --git a/OpenSim/Framework/Communications/LoginService.cs b/OpenSim/Framework/Communications/LoginService.cs
index afe7359..f8ac75e 100644
--- a/OpenSim/Framework/Communications/LoginService.cs
+++ b/OpenSim/Framework/Communications/LoginService.cs
@@ -84,6 +84,7 @@ namespace OpenSim.Framework.UserManagement
         /// </summary>
         /// <param name="userID"></param>
         /// <returns></returns>
+        /// <exception cref='System.Net.WebException'>This will be thrown if there is a problem with the inventory service</exception>
         protected abstract InventoryData GetInventorySkeleton(LLUUID userID);     
         
         /// <summary>
@@ -208,9 +209,20 @@ namespace OpenSim.Framework.UserManagement
                     try
                     {
                         LLUUID agentID = userProfile.ID;
-
-                        // Inventory Library Section
-                        InventoryData inventData = GetInventorySkeleton(agentID);
+                        InventoryData inventData = null;
+                        
+                        try
+                        {                                               
+                            inventData = GetInventorySkeleton(agentID);
+                        }
+                        catch (System.Net.WebException e)
+                        {
+                            m_log.ErrorFormat(
+                                "[LOGIN]: Error retrieving inventory skeleton of agent {0}, {1} - {2}", agentID, e.GetType(), e.Message);
+                            
+                            return logResponse.CreateLoginInventoryFailedResponse();                                                                                                        
+                        }                        
+                        
                         ArrayList AgentInventoryArray = inventData.InventoryArray;
 
                         Hashtable InventoryRootHash = new Hashtable();
@@ -218,7 +230,20 @@ namespace OpenSim.Framework.UserManagement
                         ArrayList InventoryRoot = new ArrayList();
                         InventoryRoot.Add(InventoryRootHash);
                         userProfile.RootInventoryFolderID = inventData.RootFolderID;
+                        
+                        // Inventory Library Section
+                        Hashtable InventoryLibRootHash = new Hashtable();
+                        InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
+                        ArrayList InventoryLibRoot = new ArrayList();
+                        InventoryLibRoot.Add(InventoryLibRootHash);
+                        logResponse.InventoryLibRoot = InventoryLibRoot;
 
+                        logResponse.InventoryLibraryOwner = GetLibraryOwner();
+                        
+                        logResponse.InventoryRoot = InventoryRoot;
+                        logResponse.InventorySkeleton = AgentInventoryArray;
+                        logResponse.InventoryLibrary = GetInventoryLibrary(); 
+                        
                         // Circuit Code
                         uint circode = (uint) (Util.RandomClass.Next());
 
@@ -227,17 +252,7 @@ namespace OpenSim.Framework.UserManagement
                         logResponse.AgentID = agentID.ToString();
                         logResponse.SessionID = userProfile.CurrentAgent.SessionID.ToString();
                         logResponse.SecureSessionID = userProfile.CurrentAgent.SecureSessionID.ToString();
-                        logResponse.InventoryRoot = InventoryRoot;
-                        logResponse.InventorySkeleton = AgentInventoryArray;
-                        logResponse.InventoryLibrary = GetInventoryLibrary();
 
-                        Hashtable InventoryLibRootHash = new Hashtable();
-                        InventoryLibRootHash["folder_id"] = "00000112-000f-0000-0000-000100bba000";
-                        ArrayList InventoryLibRoot = new ArrayList();
-                        InventoryLibRoot.Add(InventoryLibRootHash);
-                        logResponse.InventoryLibRoot = InventoryLibRoot;
-
-                        logResponse.InventoryLibraryOwner = GetLibraryOwner();
                         logResponse.CircuitCode = (Int32) circode;
                         //logResponse.RegionX = 0; //overwritten
                         //logResponse.RegionY = 0; //overwritten
diff --git a/OpenSim/Grid/UserServer/UserLoginService.cs b/OpenSim/Grid/UserServer/UserLoginService.cs
index 78055c8..c07777e 100644
--- a/OpenSim/Grid/UserServer/UserLoginService.cs
+++ b/OpenSim/Grid/UserServer/UserLoginService.cs
@@ -302,6 +302,8 @@ namespace OpenSim.Grid.UserServer
         // See LoginService
         protected override InventoryData GetInventorySkeleton(LLUUID userID)
         {
+            m_log.InfoFormat("[LOGIN]: Contacting inventory service at {0} for inventory skeleton of agent {1}", m_config.InventoryUrl, userID);
+            
             List<InventoryFolderBase> folders
                 = SynchronousRestObjectPoster.BeginPostObject<Guid, List<InventoryFolderBase>>(
                     "POST", m_config.InventoryUrl + "RootFolders/", userID.UUID);