* Fix problem where inventory code throws a swallowed exception on grid mode if the avatar has never logged in before

2 files changed, 34 insertions, 18 deletions

diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index a0228e8..3187215 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -79,25 +79,41 @@ namespace OpenSim.Framework.Communications
         // See IInventoryServices
         public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
         {
-            //m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
-            
-            List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
-            
-            InventoryFolderBase rootFolder = RequestRootFolder(userId);
-            userFolders.Add(rootFolder);
-                         
-            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+            try
             {
-                IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
-                userFolders.AddRange(folders);
-            }    
-            
-//            foreach (InventoryFolderBase folder in userFolders)
-//            {
-//                m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
-//            }
+                m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
+                
+                List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
+                
+                InventoryFolderBase rootFolder = RequestRootFolder(userId);
+                
+                // Agent is completely new and has no inventory structure yet.
+                if (null == rootFolder)
+                {
+                    return null;                    
+                }
+                
+                userFolders.Add(rootFolder);
+                             
+                foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
+                {
+                    IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
+                    userFolders.AddRange(folders);
+                }    
+                
+    //            foreach (InventoryFolderBase folder in userFolders)
+    //            {
+    //                m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
+    //            }
+                
+                return userFolders;
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("GetInventorySkeleton() exception {0}", e);
+            }
             
-            return userFolders;
+            return null;
         }
 
         // See IInventoryServices
diff --git a/OpenSim/Region/Environment/Scenes/InnerScene.cs b/OpenSim/Region/Environment/Scenes/InnerScene.cs
index 1187c37..fb4f02c 100644
--- a/OpenSim/Region/Environment/Scenes/InnerScene.cs
+++ b/OpenSim/Region/Environment/Scenes/InnerScene.cs
@@ -1201,7 +1201,7 @@ namespace OpenSim.Region.Environment.Scenes
         }
 
         /// <summary>
-        /// 
+        /// Duplicate the given object.
         /// </summary>
         /// <param name="originalPrim"></param>
         /// <param name="offset"></param>