diff options
| author | UbitUmarov | 2018-10-08 16:59:57 +0100 |
|---|---|---|
| committer | UbitUmarov | 2018-10-08 16:59:57 +0100 |
| commit | 7eeaee631d45fc5f85f1f45ee00d91b201b442a7 (patch) | |
| tree | a6077ca72350c2009c7cd015cf5afdb9eb307c9e | |
| parent | try to make inventory fetch tests happy (diff) | |
| download | opensim-SC-7eeaee631d45fc5f85f1f45ee00d91b201b442a7.zip opensim-SC-7eeaee631d45fc5f85f1f45ee00d91b201b442a7.tar.gz opensim-SC-7eeaee631d45fc5f85f1f45ee00d91b201b442a7.tar.bz2 opensim-SC-7eeaee631d45fc5f85f1f45ee00d91b201b442a7.tar.xz | |
avoid a null ref
| -rw-r--r-- | OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs index 2a25d9c..ff28c0f 100644 --- a/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs +++ b/OpenSim/Capabilities/Handlers/FetchInventory/FetchInvDescHandler.cs | |||
| @@ -110,7 +110,9 @@ namespace OpenSim.Capabilities.Handlers | |||
| 110 | List<InventoryCollection> invcollSet = Fetch(folders, bad_folders, ref total_folders, ref total_items); | 110 | List<InventoryCollection> invcollSet = Fetch(folders, bad_folders, ref total_folders, ref total_items); |
| 111 | //m_log.DebugFormat("[XXX]: Got {0} folders from a request of {1}", invcollSet.Count, folders.Count); | 111 | //m_log.DebugFormat("[XXX]: Got {0} folders from a request of {1}", invcollSet.Count, folders.Count); |
| 112 | 112 | ||
| 113 | int invcollSetCount = invcollSet.Count; | 113 | int invcollSetCount = 0; |
| 114 | if (invcollSet != null) | ||
| 115 | invcollSetCount = invcollSet.Count; | ||
| 114 | 116 | ||
| 115 | int mem = 8192 + ((256 * invcollSetCount + | 117 | int mem = 8192 + ((256 * invcollSetCount + |
| 116 | 384 * total_folders + | 118 | 384 * total_folders + |