From aef6fd6927d71aef34396d08cd31f108bc907318 Mon Sep 17 00:00:00 2001 From: Justin Clark-Casey (justincc) Date: Wed, 21 Jan 2015 20:54:23 +0000 Subject: If the SnedInventoryAync() method receives an exception log this but make sure it does not terminate the process. Relates to http://opensimulator.org/mantis/view.php?id=7421 --- OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'OpenSim') diff --git a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs index ea242f5..ef2125b 100644 --- a/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs +++ b/OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs @@ -487,7 +487,16 @@ namespace OpenSim.Region.Framework.Scenes void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) { - SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); + try + { + SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); + } + catch (Exception e) + { + m_log.Error( + string.Format( + "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}. Exception ", e)); + } } void SendInventoryComplete(IAsyncResult iar) -- cgit v1.1