Merge branch 'master' into bigmerge

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs

1 files changed, 176 insertions, 0 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
new file mode 100644
index 0000000..b7b8db4
--- /dev/null
+++ b/OpenSim/Region/Framework/Scenes/Tests/ScenePresenceSitTests.cs
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Reflection;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenSim.Framework;
+using OpenSim.Framework.Communications;
+using OpenSim.Framework.Servers;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.CoreModules.ServiceConnectorsOut.Simulation;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+using System.Threading;
+
+namespace OpenSim.Region.Framework.Scenes.Tests
+{
+    [TestFixture]
+    public class ScenePresenceSitTests
+    {
+        private TestScene m_scene;
+        private ScenePresence m_sp;
+
+        [SetUp]
+        public void Init()
+        {
+            m_scene = SceneHelpers.SetupScene();
+            m_sp = SceneHelpers.AddScenePresence(m_scene, TestHelpers.ParseTail(0x1));
+        }
+
+        [Test]
+        public void TestSitOutsideRangeNoTarget()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // More than 10 meters away from 0, 0, 0 (default part position)
+            Vector3 startPos = new Vector3(10.1f, 0, 0);
+            m_sp.AbsolutePosition = startPos;
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
+
+            m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(m_sp.ParentID, Is.EqualTo(0));
+        }
+
+        [Test]
+        public void TestSitWithinRangeNoTarget()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // Less than 10 meters away from 0, 0, 0 (default part position)
+            Vector3 startPos = new Vector3(9.9f, 0, 0);
+            m_sp.AbsolutePosition = startPos;
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
+
+            m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
+        }
+
+        [Test]
+        public void TestSitAndStandWithNoSitTarget()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // Make sure we're within range to sit
+            Vector3 startPos = new Vector3(1, 1, 1);
+            m_sp.AbsolutePosition = startPos;
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
+
+            m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
+            Assert.That(m_sp.PhysicsActor, Is.Null);
+
+            // FIXME: This is different for live avatars - z position is adjusted.  This is half the height of the
+            // default avatar.
+            // Curiously, Vector3.ToString() will not display the last two places of the float.  For example,
+            // printing out npc.AbsolutePosition will give <0, 0, 0.8454993> not <0, 0, 0.845499337>
+            Assert.That(
+                m_sp.AbsolutePosition,
+                Is.EqualTo(part.AbsolutePosition + new Vector3(0, 0, 0.845499337f)));
+
+            m_sp.StandUp();
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(m_sp.ParentID, Is.EqualTo(0));
+            Assert.That(m_sp.PhysicsActor, Is.Not.Null);
+        }
+
+        [Test]
+        public void TestSitAndStandWithSitTarget()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // If a prim has a sit target then we can sit from any distance away
+            Vector3 startPos = new Vector3(128, 128, 30);
+            m_sp.AbsolutePosition = startPos;
+
+            SceneObjectPart part = SceneHelpers.AddSceneObject(m_scene);
+            part.SitTargetPosition = new Vector3(0, 0, 1);
+
+            m_sp.HandleAgentRequestSit(m_sp.ControllingClient, m_sp.UUID, part.UUID, Vector3.Zero);
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(m_sp.UUID));
+            Assert.That(m_sp.ParentID, Is.EqualTo(part.LocalId));
+            Assert.That(
+                m_sp.AbsolutePosition,
+                Is.EqualTo(part.AbsolutePosition + part.SitTargetPosition + ScenePresence.SIT_TARGET_ADJUSTMENT));
+            Assert.That(m_sp.PhysicsActor, Is.Null);
+
+            m_sp.StandUp();
+
+            Assert.That(part.SitTargetAvatar, Is.EqualTo(UUID.Zero));
+            Assert.That(m_sp.ParentID, Is.EqualTo(0));
+            Assert.That(m_sp.PhysicsActor, Is.Not.Null);
+        }
+
+        [Test]
+        public void TestSitAndStandOnGround()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // If a prim has a sit target then we can sit from any distance away
+//            Vector3 startPos = new Vector3(128, 128, 30);
+//            sp.AbsolutePosition = startPos;
+
+            m_sp.HandleAgentSitOnGround();
+
+            Assert.That(m_sp.SitGround, Is.True);
+            Assert.That(m_sp.PhysicsActor, Is.Null);
+
+            m_sp.StandUp();
+
+            Assert.That(m_sp.SitGround, Is.False);
+            Assert.That(m_sp.PhysicsActor, Is.Not.Null);
+        }
+    }
+}
\ No newline at end of file