aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Grid
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-04-22 17:24:13 +0000
committerJustin Clarke Casey2008-04-22 17:24:13 +0000
commit269a2e4b887b9841309d4472508b19324a91d80d (patch)
tree46b73fce787b9e296c06265a66baba2caa92b8d4 /OpenSim/Grid
parent* ODE Update! If you roll your own, make sure to download the lib source ag... (diff)
downloadopensim-SC_OLD-269a2e4b887b9841309d4472508b19324a91d80d.zip
opensim-SC_OLD-269a2e4b887b9841309d4472508b19324a91d80d.tar.gz
opensim-SC_OLD-269a2e4b887b9841309d4472508b19324a91d80d.tar.bz2
opensim-SC_OLD-269a2e4b887b9841309d4472508b19324a91d80d.tar.xz
* Allow folder renaming to complete after an agent inventory has been received by a region from the inventory service
* This replaces the old behaviour of failing straight away, which could cause lost updates if the inventory service was slow in responding * This is the first baby step to making all inventory requests behave this way, to reduce inventory lossage
Diffstat (limited to 'OpenSim/Grid')
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs6
1 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 82ba7df..fe892ca 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -28,6 +28,8 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Reflection; 30using System.Reflection;
31using System.Threading;
32
31using libsecondlife; 33using libsecondlife;
32using log4net; 34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
@@ -108,7 +110,7 @@ namespace OpenSim.Grid.InventoryServer
108 public InventoryCollection GetUserInventory(Guid rawUserID) 110 public InventoryCollection GetUserInventory(Guid rawUserID)
109 { 111 {
110 // uncomment me to simulate an overloaded inventory server 112 // uncomment me to simulate an overloaded inventory server
111 //Thread.Sleep(25000); 113 //Thread.Sleep(20000);
112 114
113 LLUUID userID = new LLUUID(rawUserID); 115 LLUUID userID = new LLUUID(rawUserID);
114 116
@@ -165,6 +167,8 @@ namespace OpenSim.Grid.InventoryServer
165 /// <returns></returns> 167 /// <returns></returns>
166 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) 168 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
167 { 169 {
170 //Thread.Sleep(10000);
171
168 LLUUID userID = new LLUUID(rawUserID); 172 LLUUID userID = new LLUUID(rawUserID);
169 return GetInventorySkeleton(userID); 173 return GetInventorySkeleton(userID);
170 } 174 }