aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLDataStore.cs6
-rw-r--r--OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs5
-rw-r--r--OpenSim/Grid/InventoryServer/GridInventoryService.cs7
-rw-r--r--OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs3
-rw-r--r--OpenSim/Region/Physics/OdePlugin/OdePlugin.cs3
5 files changed, 6 insertions, 18 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLDataStore.cs b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
index 125501b..08217dc 100644
--- a/OpenSim/Data/MSSQL/MSSQLDataStore.cs
+++ b/OpenSim/Data/MSSQL/MSSQLDataStore.cs
@@ -431,12 +431,6 @@ namespace OpenSim.Data.MSSQL
431 431
432 public void StoreLandObject(ILandObject parcel) 432 public void StoreLandObject(ILandObject parcel)
433 { 433 {
434 // Instance.StoreLandObject(parcel, regionUUID);
435
436 // Does the new locking fix it?
437 // m_log.Info("[DATASTORE]: Tedds temp fix: Waiting 3 seconds to avoid others writing to table while we hold a dataset of it. (Someone please fix! :))");
438 // System.Threading.Thread.Sleep(2500 + rnd.Next(0, 1000));
439
440 lock (m_dataSet) 434 lock (m_dataSet)
441 { 435 {
442 DataTable land = m_landTable; 436 DataTable land = m_landTable;
diff --git a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
index e8cc7d2..ea27346 100644
--- a/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
+++ b/OpenSim/Framework/Communications/Cache/UserProfileCacheService.cs
@@ -268,12 +268,13 @@ namespace OpenSim.Framework.Communications.Cache
268 // inventory failure. 268 // inventory failure.
269 // 269 //
270 // This is a crude way of dealing with that by retrying the lookup. 270 // This is a crude way of dealing with that by retrying the lookup.
271 //BUG: This should be replaced with a async event.
271 if (!userProfile.HasInventory) 272 if (!userProfile.HasInventory)
272 { 273 {
273 int attempts = 5; 274 int attempts = 5;
274 while (attempts-- > 0) 275 while (attempts-- > 0)
275 { 276 {
276 Thread.Sleep(3000); 277 Thread.Sleep(500);
277 278
278 if (userProfile.HasInventory) 279 if (userProfile.HasInventory)
279 { 280 {
@@ -369,7 +370,7 @@ namespace OpenSim.Framework.Communications.Cache
369 "[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}", 370 "[INVENTORY CACHE]: Poll number {0} for inventory items in folder {1} for user {2}",
370 attempts, folderID, agentID); 371 attempts, folderID, agentID);
371 372
372 Thread.Sleep(3000); 373 Thread.Sleep(500);
373 374
374 if (userProfile.HasInventory) 375 if (userProfile.HasInventory)
375 { 376 {
diff --git a/OpenSim/Grid/InventoryServer/GridInventoryService.cs b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
index 4864185..2ba215b 100644
--- a/OpenSim/Grid/InventoryServer/GridInventoryService.cs
+++ b/OpenSim/Grid/InventoryServer/GridInventoryService.cs
@@ -60,9 +60,6 @@ namespace OpenSim.Grid.InventoryServer
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 an overloaded inventory server
65 //Thread.Sleep(18000);
66 63
67 InventoryCollection invCollection = new InventoryCollection(); 64 InventoryCollection invCollection = new InventoryCollection();
68 65
@@ -114,9 +111,7 @@ namespace OpenSim.Grid.InventoryServer
114 /// <param name="rawUserID"></param> 111 /// <param name="rawUserID"></param>
115 /// <returns></returns> 112 /// <returns></returns>
116 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID) 113 public List<InventoryFolderBase> GetInventorySkeleton(Guid rawUserID)
117 { 114 {
118 //Thread.Sleep(10000);
119
120 LLUUID userID = new LLUUID(rawUserID); 115 LLUUID userID = new LLUUID(rawUserID);
121 return GetInventorySkeleton(userID); 116 return GetInventorySkeleton(userID);
122 } 117 }
diff --git a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
index 7b1211f..a2ccc37 100644
--- a/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
+++ b/OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs
@@ -100,7 +100,8 @@ namespace OpenSim.Region.Modules.AvatarFactory
100 } 100 }
101 else 101 else
102 { 102 {
103 Thread.Sleep(5000); //why is this here? 103 // BUG: !? (Reduced from 5000 to 500 by Adam)
104 Thread.Sleep(500); //why is this here?
104 105
105 //this is the first thread to request this appearance 106 //this is the first thread to request this appearance
106 //so let it check the db and if not found then create a default appearance 107 //so let it check the db and if not found then create a default appearance
diff --git a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
index acc0cee..076dfdf 100644
--- a/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
+++ b/OpenSim/Region/Physics/OdePlugin/OdePlugin.cs
@@ -1103,9 +1103,6 @@ namespace OpenSim.Region.Physics.OdePlugin
1103 { 1103 {
1104 if (prim.prim_geom != (IntPtr)0) 1104 if (prim.prim_geom != (IntPtr)0)
1105 { 1105 {
1106
1107
1108 //System.Threading.Thread.Sleep(20);
1109 prim.ResetTaints(); 1106 prim.ResetTaints();
1110 1107
1111 1108