Changing Scene.ForEachClient to use the synchronous for loop instead of Parallel. This is quite possibly the source of some deadlocking, and at the very least the synchronous version gives better stack traces

* Lock the LLUDPClient RTO math * Add a helper function for backing off the RTO, and follow the optional advice in RFC 2988 to clear existing SRTT and RTTVAR values during a backoff

* Removing the unused PrimitiveBaseShape.SculptImage parameter * Improved performance of SceneObjectPart instantiation * ZeroMesher now drops SculptData bytes like Meshmerizer, to allow the texture data to be GCed * Improved typecasting speed in MySQLLegacyRegionData.BuildShape()

* Improved the instantiation of PrimitiveBaseShape

2 files changed, 26 insertions, 30 deletions

diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index fc05d1d..4d49733 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -167,9 +167,6 @@ namespace OpenSim.Data.MySQL
                                 asset.Temporary = Convert.ToBoolean(dbReader["temporary"]);
                             }
                         }
-
-                        if (asset != null)
-                            UpdateAccessTime(asset);
                     }
                     catch (Exception e)
                     {
diff --git a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
index 801d6b9..c07963c 100644
--- a/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLLegacyRegionData.cs
@@ -1430,37 +1430,36 @@ namespace OpenSim.Data.MySQL
         {
             PrimitiveBaseShape s = new PrimitiveBaseShape();
             s.Scale = new Vector3(
-                Convert.ToSingle(row["ScaleX"]),
-                Convert.ToSingle(row["ScaleY"]),
-                Convert.ToSingle(row["ScaleZ"])
-                );
+                (float)(double)row["ScaleX"],
+                (float)(double)row["ScaleY"],
+                (float)(double)row["ScaleZ"]
+            );
             // paths
-            s.PCode = Convert.ToByte(row["PCode"]);
-            s.PathBegin = Convert.ToUInt16(row["PathBegin"]);
-            s.PathEnd = Convert.ToUInt16(row["PathEnd"]);
-            s.PathScaleX = Convert.ToByte(row["PathScaleX"]);
-            s.PathScaleY = Convert.ToByte(row["PathScaleY"]);
-            s.PathShearX = Convert.ToByte(row["PathShearX"]);
-            s.PathShearY = Convert.ToByte(row["PathShearY"]);
-            s.PathSkew = Convert.ToSByte(row["PathSkew"]);
-            s.PathCurve = Convert.ToByte(row["PathCurve"]);
-            s.PathRadiusOffset = Convert.ToSByte(row["PathRadiusOffset"]);
-            s.PathRevolutions = Convert.ToByte(row["PathRevolutions"]);
-            s.PathTaperX = Convert.ToSByte(row["PathTaperX"]);
-            s.PathTaperY = Convert.ToSByte(row["PathTaperY"]);
-            s.PathTwist = Convert.ToSByte(row["PathTwist"]);
-            s.PathTwistBegin = Convert.ToSByte(row["PathTwistBegin"]);
+            s.PCode = (byte)(int)row["PCode"];
+            s.PathBegin = (ushort)(int)row["PathBegin"];
+            s.PathEnd = (ushort)(int)row["PathEnd"];
+            s.PathScaleX = (byte)(int)row["PathScaleX"];
+            s.PathScaleY = (byte)(int)row["PathScaleY"];
+            s.PathShearX = (byte)(int)row["PathShearX"];
+            s.PathShearY = (byte)(int)row["PathShearY"];
+            s.PathSkew = (sbyte)(int)row["PathSkew"];
+            s.PathCurve = (byte)(int)row["PathCurve"];
+            s.PathRadiusOffset = (sbyte)(int)row["PathRadiusOffset"];
+            s.PathRevolutions = (byte)(int)row["PathRevolutions"];
+            s.PathTaperX = (sbyte)(int)row["PathTaperX"];
+            s.PathTaperY = (sbyte)(int)row["PathTaperY"];
+            s.PathTwist = (sbyte)(int)row["PathTwist"];
+            s.PathTwistBegin = (sbyte)(int)row["PathTwistBegin"];
             // profile
-            s.ProfileBegin = Convert.ToUInt16(row["ProfileBegin"]);
-            s.ProfileEnd = Convert.ToUInt16(row["ProfileEnd"]);
-            s.ProfileCurve = Convert.ToByte(row["ProfileCurve"]);
-            s.ProfileHollow = Convert.ToUInt16(row["ProfileHollow"]);
-            byte[] textureEntry = (byte[]) row["Texture"];
-            s.TextureEntry = textureEntry;
+            s.ProfileBegin = (ushort)(int)row["ProfileBegin"];
+            s.ProfileEnd = (ushort)(int)row["ProfileEnd"];
+            s.ProfileCurve = (byte)(int)row["ProfileCurve"];
+            s.ProfileHollow = (ushort)(int)row["ProfileHollow"];
+            s.TextureEntry = (byte[])row["Texture"];
 
-            s.ExtraParams = (byte[]) row["ExtraParams"];
+            s.ExtraParams = (byte[])row["ExtraParams"];
 
-            s.State = Convert.ToByte(row["State"]);
+            s.State = (byte)(int)row["State"];
 
             return s;
         }