From 1a8a77c41e4061b75ff97fcf89e39717550bfa25 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Sat, 24 Jun 2017 09:24:56 +0100
Subject: 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

---
 OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
index 5e6a638..e9767f3 100644
--- a/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
+++ b/OpenSim/Tests/Stress/VectorRenderModuleStressTests.cs
@@ -118,8 +118,7 @@ namespace OpenSim.Tests.Stress
                         so.UUID,
                         m_tests.Vrm.GetContentType(),
                         string.Format("PenColour BLACK; MoveTo 40,220; FontSize 32; Text {0};", text),
-                        "",
-                        0);
+                        "");
 
                     Assert.That(originalTextureID, Is.Not.EqualTo(so.RootPart.Shape.Textures.GetFace(0).TextureID));
 
-- 
cgit v1.1


From aff9c345dddfa290222ceaf42b6c452a590a2276 Mon Sep 17 00:00:00 2001
From: UbitUmarov
Date: Wed, 12 Jul 2017 07:27:21 +0100
Subject:  osSetParcelDetails: add more land update code

---
 OpenSim/Tests/Common/Mock/TestLandChannel.cs | 1 +
 1 file changed, 1 insertion(+)

(limited to 'OpenSim/Tests')

diff --git a/OpenSim/Tests/Common/Mock/TestLandChannel.cs b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
index 48dc840..05db03fe 100644
--- a/OpenSim/Tests/Common/Mock/TestLandChannel.cs
+++ b/OpenSim/Tests/Common/Mock/TestLandChannel.cs
@@ -109,6 +109,7 @@ namespace OpenSim.Tests.Common
         public bool IsLandPrimCountTainted() { return false; }
         public bool IsForcefulBansAllowed() { return false; }
         public void UpdateLandObject(int localID, LandData data) {}
+        public void SendParcelsOverlay(IClientAPI client) {}
         public void ReturnObjectsInParcel(int localID, uint returnType, UUID[] agentIDs, UUID[] taskIDs, IClientAPI remoteClient) {}
         public void setParcelObjectMaxOverride(overrideParcelMaxPrimCountDelegate overrideDel) {}
         public void setSimulatorObjectMaxOverride(overrideSimulatorMaxPrimCountDelegate overrideDel) {}
-- 
cgit v1.1