diff options
| author | Justin Clark-Casey (justincc) | 2012-06-29 00:11:44 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2012-06-29 00:11:44 +0100 |
| commit | 0f6b7b6a41ef40e8798638b79c4c62f00556a093 (patch) | |
| tree | adf594811c11c9b4604c5704688f9e8e0de642f0 /OpenSim/Capabilities/Handlers | |
| parent | Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in... (diff) | |
| download | opensim-SC_OLD-0f6b7b6a41ef40e8798638b79c4c62f00556a093.zip opensim-SC_OLD-0f6b7b6a41ef40e8798638b79c4c62f00556a093.tar.gz opensim-SC_OLD-0f6b7b6a41ef40e8798638b79c4c62f00556a093.tar.bz2 opensim-SC_OLD-0f6b7b6a41ef40e8798638b79c4c62f00556a093.tar.xz | |
If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on
Diffstat (limited to 'OpenSim/Capabilities/Handlers')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs index 515637e..9a6ca86 100644 --- a/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/WebFetchInventoryDescendents/WebFetchInvDescHandler.cs | |||
| @@ -301,7 +301,8 @@ namespace OpenSim.Capabilities.Handlers | |||
| 301 | InventoryItemBase linkedItem | 301 | InventoryItemBase linkedItem |
| 302 | = m_InventoryService.GetItem(new InventoryItemBase(link.AssetID)); | 302 | = m_InventoryService.GetItem(new InventoryItemBase(link.AssetID)); |
| 303 | 303 | ||
| 304 | itemsToReturn.Insert(0, linkedItem); | 304 | if (linkedItem != null) |
| 305 | itemsToReturn.Insert(0, linkedItem); | ||
| 305 | } | 306 | } |
| 306 | } | 307 | } |
| 307 | } | 308 | } |