diff options
| author | Justin Clark-Casey (justincc) | 2015-01-21 20:54:23 +0000 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2015-01-21 20:54:23 +0000 |
| commit | aef6fd6927d71aef34396d08cd31f108bc907318 (patch) | |
| tree | 80ab1497b397df0e4f4f57ef3f6c892e69ef1d25 | |
| parent | Don't allow a failure in create a request in HeloService.Connector.Helo() to ... (diff) | |
| download | opensim-SC-aef6fd6927d71aef34396d08cd31f108bc907318.zip opensim-SC-aef6fd6927d71aef34396d08cd31f108bc907318.tar.gz opensim-SC-aef6fd6927d71aef34396d08cd31f108bc907318.tar.bz2 opensim-SC-aef6fd6927d71aef34396d08cd31f108bc907318.tar.xz | |
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
| -rw-r--r-- | OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs | 11 |
1 files changed, 10 insertions, 1 deletions
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 | |||
| 487 | 487 | ||
| 488 | void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) | 488 | void SendInventoryAsync(IClientAPI remoteClient, UUID folderID, UUID ownerID, bool fetchFolders, bool fetchItems, int sortOrder) |
| 489 | { | 489 | { |
| 490 | SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); | 490 | try |
| 491 | { | ||
| 492 | SendInventoryUpdate(remoteClient, new InventoryFolderBase(folderID), fetchFolders, fetchItems); | ||
| 493 | } | ||
| 494 | catch (Exception e) | ||
| 495 | { | ||
| 496 | m_log.Error( | ||
| 497 | string.Format( | ||
| 498 | "[AGENT INVENTORY]: Error in SendInventoryAsync() for {0} with folder ID {1}. Exception ", e)); | ||
| 499 | } | ||
| 491 | } | 500 | } |
| 492 | 501 | ||
| 493 | void SendInventoryComplete(IAsyncResult iar) | 502 | void SendInventoryComplete(IAsyncResult iar) |