aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/Communications
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-03-31 17:34:32 +0000
committerJustin Clarke Casey2008-03-31 17:34:32 +0000
commit48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f (patch)
treedd91b7e00eae88b44246ec4719bb57336c87b5a2 /OpenSim/Framework/Communications
parent* Fix problem where inventory code throws a swallowed exception on grid mode ... (diff)
downloadopensim-SC_OLD-48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f.zip
opensim-SC_OLD-48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f.tar.gz
opensim-SC_OLD-48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f.tar.bz2
opensim-SC_OLD-48fc4ee059bea6c655686ee3ba7d2ff81b37dc4f.tar.xz
* Log exceptions which make it up to the top of the http request frame, rather than having them disappear off into the ether
Diffstat (limited to 'OpenSim/Framework/Communications')
-rw-r--r--OpenSim/Framework/Communications/InventoryServiceBase.cs52
1 files changed, 21 insertions, 31 deletions
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
79 // See IInventoryServices 79 // See IInventoryServices
80 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId) 80 public List<InventoryFolderBase> GetInventorySkeleton(LLUUID userId)
81 { 81 {
82 try 82 m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId);
83
84 InventoryFolderBase rootFolder = RequestRootFolder(userId);
85
86 // Agent is completely new and has no inventory structure yet.
87 if (null == rootFolder)
83 { 88 {
84 m_log.DebugFormat("[AGENT INVENTORY]: Getting inventory skeleton for {0}", userId); 89 return null;
85
86 List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
87
88 InventoryFolderBase rootFolder = RequestRootFolder(userId);
89
90 // Agent is completely new and has no inventory structure yet.
91 if (null == rootFolder)
92 {
93 return null;
94 }
95
96 userFolders.Add(rootFolder);
97
98 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
99 {
100 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
101 userFolders.AddRange(folders);
102 }
103
104 // foreach (InventoryFolderBase folder in userFolders)
105 // {
106 // m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
107 // }
108
109 return userFolders;
110 } 90 }
111 catch (Exception e) 91
92 List<InventoryFolderBase> userFolders = new List<InventoryFolderBase>();
93 userFolders.Add(rootFolder);
94
95 foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
112 { 96 {
113 m_log.ErrorFormat("GetInventorySkeleton() exception {0}", e); 97 IList<InventoryFolderBase> folders = plugin.Value.getFolderHierarchy(rootFolder.folderID);
114 } 98 userFolders.AddRange(folders);
99 }
115 100
116 return null; 101// foreach (InventoryFolderBase folder in userFolders)
102// {
103// m_log.DebugFormat("[AGENT INVENTORY]: Got folder {0} {1}", folder.name, folder.folderID);
104// }
105
106 return userFolders;
117 } 107 }
118 108
119 // See IInventoryServices 109 // See IInventoryServices