diff options
author | Justin Clarke Casey | 2008-04-11 18:46:54 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-04-11 18:46:54 +0000 |
commit | 7ac7f79f88f51504680a24f1621115c595492f62 (patch) | |
tree | a1b29254a35ca97f4d44dffa1bb4bd2eb863e938 /OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |
parent | * Minor inventory code cleanup following on from last patch (diff) | |
download | opensim-SC_OLD-7ac7f79f88f51504680a24f1621115c595492f62.zip opensim-SC_OLD-7ac7f79f88f51504680a24f1621115c595492f62.tar.gz opensim-SC_OLD-7ac7f79f88f51504680a24f1621115c595492f62.tar.bz2 opensim-SC_OLD-7ac7f79f88f51504680a24f1621115c595492f62.tar.xz |
* Eliminate a class of errors where an inventory request could be made before the region had completely received the inventory for the user.
* A much larger race condition where the inventory request could be made before the region gets any data at all will also be fixed in the near future.
* This change also fixes a regression from two patches ago where items stopped appearing in standalone inventory
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs index dc26ce2..8f293f9 100644 --- a/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs +++ b/OpenSim/Region/Communications/OGS1/OGS1InventoryService.cs | |||
@@ -38,7 +38,8 @@ namespace OpenSim.Region.Communications.OGS1 | |||
38 | { | 38 | { |
39 | public class OGS1InventoryService : IInventoryServices | 39 | public class OGS1InventoryService : IInventoryServices |
40 | { | 40 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | 41 | private static readonly log4net.ILog m_log |
42 | = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | 43 | ||
43 | private string _inventoryServerUrl; | 44 | private string _inventoryServerUrl; |
44 | private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); | 45 | private Dictionary<LLUUID, InventoryRequest> m_RequestingInventory = new Dictionary<LLUUID, InventoryRequest>(); |