Merge branch 'master' of /home/opensim/var/repo/opensim

OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs

@@ -308,36 +308,44 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
 
             try
             {
-                if (alpha == 256)
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
-                else
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
-                    bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
-
+                // under lock.
-                graph = Graphics.FromImage(bitmap);
+                lock (this)
-    
-                // this is really just to save people filling the 
-                // background color in their scripts, only do when fully opaque
-                if (alpha >= 255)
                 {
-                    using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
+                    if (alpha == 256)
-                    {
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppRgb);
-                        graph.FillRectangle(bgFillBrush, 0, 0, width, height);
+                    else
-                    }
+                        bitmap = new Bitmap(width, height, PixelFormat.Format32bppArgb);
-                }
     
-                for (int w = 0; w < bitmap.Width; w++)
+                    graph = Graphics.FromImage(bitmap);
-                {
+        
-                    if (alpha <= 255) 
+                    // this is really just to save people filling the 
+                    // background color in their scripts, only do when fully opaque
+                    if (alpha >= 255)
                     {
-                        for (int h = 0; h < bitmap.Height; h++)
+                        using (SolidBrush bgFillBrush = new SolidBrush(bgColor))
                         {
-                            bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            graph.FillRectangle(bgFillBrush, 0, 0, width, height);
                         }
                     }
+        
+                    for (int w = 0; w < bitmap.Width; w++)
+                    {
+                        if (alpha <= 255) 
+                        {
+                            for (int h = 0; h < bitmap.Height; h++)
+                            {
+                                bitmap.SetPixel(w, h, Color.FromArgb(alpha, bitmap.GetPixel(w, h)));
+                            }
+                        }
+                    }
+        
+                    GDIDraw(data, graph, altDataDelim);
                 }
     
-                GDIDraw(data, graph, altDataDelim);
-    
                 byte[] imageJ2000 = new byte[0];
     
                 try
@@ -355,11 +363,19 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender
             }
             finally
             {
-                if (graph != null)
+                // XXX: In testing, it appears that if multiple threads dispose of separate GDI+ objects simultaneously,
-                    graph.Dispose();
+                // the native malloc heap can become corrupted, possibly due to a double free().  This may be due to
-
+                // bugs in the underlying libcairo used by mono's libgdiplus.dll on Linux/OSX.  These problems were
-                if (bitmap != null)
+                // seen with both libcario 1.10.2-6.1ubuntu3 and 1.8.10-2ubuntu1.  They go away if disposal is perfomed
-                    bitmap.Dispose();
+                // under lock.
+                lock (this)
+                {
+                    if (graph != null)
+                        graph.Dispose();
+    
+                    if (bitmap != null)
+                        bitmap.Dispose();
+                }
             }
         }
         

OpenSim/Region/CoreModules/World/Sound/SoundModule.cs

@@ -85,13 +85,15 @@ namespace OpenSim.Region.CoreModules.World.Sound
                         dis = 0;
                 }
 
+                float thisSpGain;
+
                 // Scale by distance
                 if (radius == 0)
-                    gain = (float)((double)gain * ((100.0 - dis) / 100.0));
+                    thisSpGain = (float)((double)gain * ((100.0 - dis) / 100.0));
                 else
-                    gain = (float)((double)gain * ((radius - dis) / radius));
+                    thisSpGain = (float)((double)gain * ((radius - dis) / radius));
 
-                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, (float)gain, flags);
+                sp.ControllingClient.SendPlayAttachedSound(soundID, objectID, ownerID, thisSpGain, flags);
             });
         }
         

OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

@@ -1341,11 +1341,13 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                 scale.y = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.y));
                 scale.z = Math.Max(World.m_minPhys, Math.Min(World.m_maxPhys, scale.z));
             }
-
+            else
-            // Next we clamp the scale to the non-physical min/max
+            {
-            scale.x = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.x));
+                // If not physical, then we clamp the scale to the non-physical min/max
-            scale.y = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.y));
+                scale.x = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.x));
-            scale.z = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.z));
+                scale.y = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.y));
+                scale.z = Math.Max(World.m_minNonphys, Math.Min(World.m_maxNonphys, scale.z));
+            }
 
             Vector3 tmp = part.Scale;
             tmp.X = (float)scale.x;