diff options
Diffstat (limited to 'OpenSim/Region')
-rw-r--r-- | OpenSim/Region/Modules/AvatarFactory/AvatarFactoryModule.cs | 3 | ||||
-rw-r--r-- | OpenSim/Region/Physics/OdePlugin/OdePlugin.cs | 3 |
2 files changed, 2 insertions, 4 deletions
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 | ||