aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2014-02-20 22:35:41 +0000
committerJustin Clark-Casey (justincc)2014-02-20 22:35:41 +0000
commitd50d169441d7394e1391d2d6b862a5607c07c6a0 (patch)
tree75f9e9a59396bf27052171b1110ae08fcd01bde4 /OpenSim/Services
parentminor: Add some method doc to AFM,SetAppearanceAssets() (diff)
downloadopensim-SC_OLD-d50d169441d7394e1391d2d6b862a5607c07c6a0.zip
opensim-SC_OLD-d50d169441d7394e1391d2d6b862a5607c07c6a0.tar.gz
opensim-SC_OLD-d50d169441d7394e1391d2d6b862a5607c07c6a0.tar.bz2
opensim-SC_OLD-d50d169441d7394e1391d2d6b862a5607c07c6a0.tar.xz
If GetFolderContent called by WebFetchInvDescHandler.Fetch() fails for some reason and returns null, log and return empty contents rather than throwing an exception that ends up terminating the simulator.
Diffstat (limited to 'OpenSim/Services')
-rw-r--r--OpenSim/Services/Interfaces/IInventoryService.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index a8bfe47..36634a3 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Services.Interfaces
91 /// </summary> 91 /// </summary>
92 /// <param name="userId"></param> 92 /// <param name="userId"></param>
93 /// <param name="folderID"></param> 93 /// <param name="folderID"></param>
94 /// <returns></returns> 94 /// <returns>Inventory content. null if the request failed.</returns>
95 InventoryCollection GetFolderContent(UUID userID, UUID folderID); 95 InventoryCollection GetFolderContent(UUID userID, UUID folderID);
96 96
97 /// <summary> 97 /// <summary>