revert the thread level change; remove unused dynamic texture timer from internal code; let blend alpha work if < 255; let blend work with the selected face; etc

1 files changed, 16 insertions, 32 deletions

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index ed255bf..325f7f9 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -77,8 +77,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
-                "",
-                0);
+                "");
 
             Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -98,8 +97,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -108,8 +106,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -129,8 +126,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -139,8 +135,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "alpha:250",
-                0);
+                "alpha:250");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -161,8 +156,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -171,8 +165,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -191,8 +184,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World;",
-                "",
-                0);
+                "");
 
             Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -213,8 +205,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -223,8 +214,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             Assert.That(firstDynamicTextureID, Is.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -253,8 +243,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "1024",
-                0);
+                "1024");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -263,8 +252,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "1024",
-                0);
+                "1024");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -284,8 +272,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -294,8 +281,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "alpha:250",
-                0);
+                "alpha:250");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }
@@ -316,8 +302,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             UUID firstDynamicTextureID = so.RootPart.Shape.Textures.GetFace(0).TextureID;
 
@@ -326,8 +311,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
                 so.UUID,
                 m_vrm.GetContentType(),
                 dtText,
-                "",
-                0);
+                "");
 
             Assert.That(firstDynamicTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
         }