OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix last log message, and change things a bit

master
UbitUmarov 2020-01-20 11:48:32 +00:00
parent ddef089eaa
commit ad6499cc09
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs
View File

@ -65,19 +65,21 @@ namespace OpenSim.Capabilities.Handlers
{ {
//m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request); //m_log.DebugFormat("[XXX]: FetchInventoryDescendentsRequest in {0}, {1}", (m_Scene == null) ? "none" : m_Scene.Name, request);
Hashtable hash = new Hashtable(); ArrayList foldersrequested = null;
try try
{ {
hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request)); Hashtable hash = (Hashtable)LLSD.LLSDDeserialize(Utils.StringToBytes(request));
foldersrequested = (ArrayList)hash["folders"];
hash = null;
} }
catch (Exception e) catch (Exception e)
{ {
m_log.ErrorFormat("[WEB FETCH INV DESC HANDLER]: Fetch error: {0}{1}" + e.Message, e.StackTrace); m_log.ErrorFormat("[FETCH INV DESC]: fail parsing request: '{0}'; path: '{1}'; exception: '{2}'", request, path, e.Message);
m_log.Error("Request: " + request); foldersrequested = null;
} }
ArrayList foldersrequested = (ArrayList)hash["folders"]; if(foldersrequested == null || foldersrequested.Count == 0)
hash.Clear(); return "<llsd><map><key>folders</key><array /></map></llsd>";
List<LLSDFetchInventoryDescendents> folders = new List<LLSDFetchInventoryDescendents>(); List<LLSDFetchInventoryDescendents> folders = new List<LLSDFetchInventoryDescendents>();
for (int i = 0; i < foldersrequested.Count; i++) for (int i = 0; i < foldersrequested.Count; i++)
@ -91,7 +93,7 @@ namespace OpenSim.Capabilities.Handlers
} }
catch (Exception e) catch (Exception e)
{ {
m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e); m_log.Debug("[WEB FETCH INV DESC HANDLER]: caught exception doing OSD deserialize" + e.Message);
continue; continue;
} }