From 48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 31 Mar 2008 17:34:32 +0000
Subject: * Log exceptions which make it up to the top of the http request
 frame, rather than having them disappear off into the ether

---
 .../Communications/InventoryServiceBase.cs         | 52 +++++++++-------------
 1 file changed, 21 insertions(+), 31 deletions(-)

(limited to 'OpenSim/Framework/Communications')

diff --git a/OpenSim/Framework/Communications/InventoryServiceBase.cs b/OpenSim/Framework/Communications/InventoryServiceBase.cs
index 3187215..f38abd3 100644
--- a/OpenSim/Framework/Communications/InventoryServiceBase.cs
+++ b/OpenSim/Framework/Communications/InventoryServiceBase.cs
@@ -79,41 +79,31 @@ namespace OpenSim.Framework.Communications
         // See IInventoryServices
         public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
         {
-            try
+            m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
+                                            
+            InventoryFolderBase rootFolder = RequestRootFolder(userId);
+            
+            // Agent is completely new and has no inventory structure yet.
+            if (null == rootFolder)
             {
-                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;
+                return null;                    
             }
-            catch (Exception e)
+            
+            List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
+            userFolders.Add(rootFolder);
+                         
+            foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
             {
-                m_log.ErrorFormat("GetInventorySkeleton() exception {0}", e);
-            }
+                IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
+                userFolders.AddRange(folders);
+            }    
             
-            return null;
+//            foreach (InventoryFolderBase folder in userFolders)
+//            {
+//                m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
+//            }
+            
+            return userFolders;
         }
 
         // See IInventoryServices
-- 
cgit v1.1