diff options
author | Justin Clarke Casey | 2008-05-09 21:33:19 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-05-09 21:33:19 +0000 |
commit | 3f345bf685a80189c8a33ec1514c356064a6fa70 (patch) | |
tree | a13c5e53faff34b77f974f3a585f5f53c4a7cceb /OpenSim/Grid/InventoryServer/GridInventoryService.cs | |
parent | m_logs always need to be private static readonly otherwise we (diff) | |
download | opensim-SC_OLD-3f345bf685a80189c8a33ec1514c356064a6fa70.zip opensim-SC_OLD-3f345bf685a80189c8a33ec1514c356064a6fa70.tar.gz opensim-SC_OLD-3f345bf685a80189c8a33ec1514c356064a6fa70.tar.bz2 opensim-SC_OLD-3f345bf685a80189c8a33ec1514c356064a6fa70.tar.xz |
* Removing polling delay for non-CAPS inventory fetch if the client has not yet received data from the inventory service
* Replaced instead with the system now used by other requests where the fetch request is placed on a queue and service when the data comes in
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Grid/InventoryServer/GridInventoryService.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs index 2ba215b..80f0c5e 100644 --- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs +++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs | |||
@@ -56,10 +56,13 @@ namespace OpenSim.Grid.InventoryServer | |||
56 | /// <param name="rawUserID"></param> | 56 | /// <param name="rawUserID"></param> |
57 | /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> | 57 | /// <returns>The user's inventory. If an inventory cannot be found then an empty collection is returned.</returns> |
58 | public InventoryCollection GetUserInventory(Guid rawUserID) | 58 | public InventoryCollection GetUserInventory(Guid rawUserID) |
59 | { | 59 | { |
60 | LLUUID userID = new LLUUID(rawUserID); | 60 | LLUUID userID = new LLUUID(rawUserID); |
61 | 61 | ||
62 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); | 62 | m_log.InfoFormat("[GRID AGENT INVENTORY]: Processing request for inventory of {0}", userID); |
63 | |||
64 | // Uncomment me to simulate a slow responding inventory server | ||
65 | //Thread.Sleep(16000); | ||
63 | 66 | ||
64 | InventoryCollection invCollection = new InventoryCollection(); | 67 | InventoryCollection invCollection = new InventoryCollection(); |
65 | 68 | ||