diff options
| author | Diva Canto | 2015-06-04 19:57:01 -0700 |
|---|---|---|
| committer | Diva Canto | 2015-06-04 19:57:01 -0700 |
| commit | 52d9ea1cee1688352f54d01032d82c9480c1bd3d (patch) | |
| tree | 7b57b92ecf0b6733b2b28b14e2784a95f505c666 /OpenSim | |
| parent | Mantis #7536. This may alleviate the side effects of broken SceneObjects XML.... (diff) | |
| download | opensim-SC-52d9ea1cee1688352f54d01032d82c9480c1bd3d.zip opensim-SC-52d9ea1cee1688352f54d01032d82c9480c1bd3d.tar.gz opensim-SC-52d9ea1cee1688352f54d01032d82c9480c1bd3d.tar.bz2 opensim-SC-52d9ea1cee1688352f54d01032d82c9480c1bd3d.tar.xz | |
Mantis #7603 -- bad folders in inventory could produce null pointer exception. Thanks for the line numbers in the exception trace.
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 7618c3d..1ad543b 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |||
| @@ -638,7 +638,7 @@ namespace OpenSim.Capabilities.Handlers | |||
| 638 | 638 | ||
| 639 | // The inventory server isn't sending FolderID in the collection... | 639 | // The inventory server isn't sending FolderID in the collection... |
| 640 | // Must fetch it individually | 640 | // Must fetch it individually |
| 641 | if (contents.FolderID == UUID.Zero) | 641 | else if (contents.FolderID == UUID.Zero) |
| 642 | { | 642 | { |
| 643 | InventoryFolderBase containingFolder = new InventoryFolderBase(); | 643 | InventoryFolderBase containingFolder = new InventoryFolderBase(); |
| 644 | containingFolder.ID = freq.folder_id; | 644 | containingFolder.ID = freq.folder_id; |