Resolve merge commits, stage 1

2 files changed, 459 insertions, 2 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index 80b60a4..8cd1e84 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -27,11 +27,13 @@
 
 using System.Collections.Generic;
 using NUnit.Framework;
+using OpenSim.Framework;
 using OpenSim.Tests.Common;
 using OpenSim.Region.ScriptEngine.Shared;
 using OpenSim.Region.Framework.Scenes;
 using Nini.Config;
 using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
 using OpenMetaverse;
 using System;
 using OpenSim.Tests.Common.Mock;
@@ -47,6 +49,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
         private const double ANGLE_ACCURACY_IN_RADIANS = 1E-6;
         private const double VECTOR_COMPONENT_ACCURACY = 0.0000005d;
+        private const double FLOAT_ACCURACY = 0.00005d;
         private LSL_Api m_lslApi;
 
         [SetUp]
@@ -57,8 +60,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             IConfig config = initConfigSource.AddConfig("XEngine");
             config.Set("Enabled", "true");
 
-            Scene scene = SceneSetupHelpers.SetupScene();
-            SceneObjectPart part = SceneSetupHelpers.AddSceneObject(scene);
+            Scene scene = SceneHelpers.SetupScene();
+            SceneObjectPart part = SceneHelpers.AddSceneObject(scene);
 
             XEngine.XEngine engine = new XEngine.XEngine();
             engine.Initialise(initConfigSource);
@@ -166,6 +169,231 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         }
 
         [Test]
+        // llSetPrimitiveParams and llGetPrimitiveParams test.
+        public void TestllSetPrimitiveParams()
+        {
+            // Create Prim1.
+            Scene scene = SceneHelpers.SetupScene();
+            string obj1Name = "Prim1";
+            UUID objUuid = new UUID("00000000-0000-0000-0000-000000000001");
+            SceneObjectPart part1 =
+                new SceneObjectPart(UUID.Zero, PrimitiveBaseShape.Default,
+                Vector3.Zero, Quaternion.Identity,
+                Vector3.Zero) { Name = obj1Name, UUID = objUuid };
+            Assert.That(scene.AddNewSceneObject(new SceneObjectGroup(part1), false), Is.True);
+
+            // Note that prim hollow check is passed with the other prim params in order to allow the
+            // specification of a different check value from the prim param. A cylinder, prism, sphere,
+            // torus or ring, with a hole shape of square, is limited to a hollow of 70%. Test 5 below
+            // specifies a value of 95% and checks to see if 70% was properly returned.
+
+            // Test a sphere.
+            CheckllSetPrimitiveParams(
+                "test 1",                                   // Prim test identification string
+                new LSL_Types.Vector3(6.0d, 9.9d, 9.9d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_SPHERE,           // Prim type
+                ScriptBaseClass.PRIM_HOLE_DEFAULT,          // Prim hole type
+                new LSL_Types.Vector3(0.0d, 0.075d, 0.0d),  // Prim cut
+                0.80d,                                      // Prim hollow
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(0.32d, 0.76d, 0.0d),  // Prim dimple
+                0.80d);                                     // Prim hollow check
+
+            // Test a prism.
+            CheckllSetPrimitiveParams(
+                "test 2",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
+                ScriptBaseClass.PRIM_HOLE_CIRCLE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.90d,                                      // Prim hollow
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.90d);                                     // Prim hollow check
+
+            // Test a box.
+            CheckllSetPrimitiveParams(
+                "test 3",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_BOX,              // Prim type
+                ScriptBaseClass.PRIM_HOLE_TRIANGLE,         // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.95d,                                      // Prim hollow
+                new LSL_Types.Vector3(1.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(1.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.95d);                                     // Prim hollow check
+
+            // Test a tube.
+            CheckllSetPrimitiveParams(
+                "test 4",                                   // Prim test identification string
+                new LSL_Types.Vector3(4.2d, 4.2d, 4.2d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_TUBE,             // Prim type
+                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.00d,                                      // Prim hollow
+                new LSL_Types.Vector3(1.0d, -1.0d, 0.0d),   // Prim twist
+                new LSL_Types.Vector3(1.0d, 0.5d, 0.0d),    // Prim hole size
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim profile cut
+                new LSL_Types.Vector3(-1.0d, 1.0d, 0.0d),   // Prim taper
+                1.0d,                                       // Prim revolutions
+                1.0d,                                       // Prim radius
+                0.0d,                                       // Prim skew
+                0.00d);                                     // Prim hollow check
+
+            // Test a prism.
+            CheckllSetPrimitiveParams(
+                "test 5",                                   // Prim test identification string
+                new LSL_Types.Vector3(3.5d, 3.5d, 3.5d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_PRISM,            // Prim type
+                ScriptBaseClass.PRIM_HOLE_SQUARE,           // Prim hole type
+                new LSL_Types.Vector3(0.0d, 1.0d, 0.0d),    // Prim cut
+                0.95d,                                      // Prim hollow
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim twist
+                new LSL_Types.Vector3(2.0d, 1.0d, 0.0d),    // Prim taper 
+                new LSL_Types.Vector3(0.0d, 0.0d, 0.0d),    // Prim shear
+                0.70d);                                     // Prim hollow check
+
+            // Test a sculpted prim.
+            CheckllSetPrimitiveParams(
+                "test 6",                                   // Prim test identification string
+                new LSL_Types.Vector3(2.0d, 2.0d, 2.0d),    // Prim size
+                ScriptBaseClass.PRIM_TYPE_SCULPT,           // Prim type
+                "be293869-d0d9-0a69-5989-ad27f1946fd4",     // Prim map
+                ScriptBaseClass.PRIM_SCULPT_TYPE_SPHERE);   // Prim sculpt type
+        }
+
+        // Set prim params for a box, cylinder or prism and check results.
+        public void CheckllSetPrimitiveParams(string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primTaper, LSL_Types.Vector3 primShear,
+            double primHollowCheck)
+        {
+            // Set the prim params.
+            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primTaper, primShear));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 6), primTest + " prim taper");
+            CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
+        }
+
+        // Set prim params for a sphere and check results.
+        public void CheckllSetPrimitiveParams(string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primDimple, double primHollowCheck)
+        {
+            // Set the prim params.
+            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primDimple));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primDimple, m_lslApi.llList2Vector(primParams, 6), primTest + " prim dimple");
+        }
+
+        // Set prim params for a torus, tube or ring and check results.
+        public void CheckllSetPrimitiveParams(string primTest,
+            LSL_Types.Vector3 primSize, int primType, int primHoleType, LSL_Types.Vector3 primCut,
+            double primHollow, LSL_Types.Vector3 primTwist, LSL_Types.Vector3 primHoleSize,
+            LSL_Types.Vector3 primShear, LSL_Types.Vector3 primProfCut, LSL_Types.Vector3 primTaper,
+            double primRev, double primRadius, double primSkew, double primHollowCheck)
+        {
+            // Set the prim params.
+            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primHoleType,
+                primCut, primHollow, primTwist, primHoleSize, primShear, primProfCut,
+                primTaper, primRev, primRadius, primSkew));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Valdate settings.
+            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primHoleType, m_lslApi.llList2Integer(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim hole default check fail");
+            CheckllSetPrimitiveParamsVector(primCut, m_lslApi.llList2Vector(primParams, 3), primTest + " prim cut");
+            Assert.AreEqual(primHollowCheck, m_lslApi.llList2Float(primParams, 4), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim hollow check fail");
+            CheckllSetPrimitiveParamsVector(primTwist, m_lslApi.llList2Vector(primParams, 5), primTest + " prim twist");
+            CheckllSetPrimitiveParamsVector(primHoleSize, m_lslApi.llList2Vector(primParams, 6), primTest + " prim hole size");
+            CheckllSetPrimitiveParamsVector(primShear, m_lslApi.llList2Vector(primParams, 7), primTest + " prim shear");
+            CheckllSetPrimitiveParamsVector(primProfCut, m_lslApi.llList2Vector(primParams, 8), primTest + " prim profile cut");
+            CheckllSetPrimitiveParamsVector(primTaper, m_lslApi.llList2Vector(primParams, 9), primTest + " prim taper");
+            Assert.AreEqual(primRev, m_lslApi.llList2Float(primParams, 10), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim revolution fail");
+            Assert.AreEqual(primRadius, m_lslApi.llList2Float(primParams, 11), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim radius fail");
+            Assert.AreEqual(primSkew, m_lslApi.llList2Float(primParams, 12), FLOAT_ACCURACY,
+                "TestllSetPrimitiveParams " + primTest + " prim skew fail");
+        }
+
+        // Set prim params for a sculpted prim and check results.
+        public void CheckllSetPrimitiveParams(string primTest,
+            LSL_Types.Vector3 primSize, int primType, string primMap, int primSculptType)
+        {
+            // Set the prim params.
+            m_lslApi.llSetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, primSize,
+                ScriptBaseClass.PRIM_TYPE, primType, primMap, primSculptType));
+
+            // Get params for prim to validate settings.
+            LSL_Types.list primParams =
+                m_lslApi.llGetPrimitiveParams(new LSL_Types.list(ScriptBaseClass.PRIM_SIZE, ScriptBaseClass.PRIM_TYPE));
+
+            // Validate settings.
+            CheckllSetPrimitiveParamsVector(primSize, m_lslApi.llList2Vector(primParams, 0), primTest + " prim size");
+            Assert.AreEqual(primType, m_lslApi.llList2Integer(primParams, 1),
+                "TestllSetPrimitiveParams " + primTest + " prim type check fail");
+            Assert.AreEqual(primMap, (string)m_lslApi.llList2String(primParams, 2),
+                "TestllSetPrimitiveParams " + primTest + " prim map check fail");
+            Assert.AreEqual(primSculptType, m_lslApi.llList2Integer(primParams, 3),
+                "TestllSetPrimitiveParams " + primTest + " prim type scuplt check fail");
+        }
+
+        public void CheckllSetPrimitiveParamsVector(LSL_Types.Vector3 vecCheck, LSL_Types.Vector3 vecReturned, string msg)
+        {
+            // Check each vector component against expected result.
+            Assert.AreEqual(vecCheck.x, vecReturned.x, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on x component");
+            Assert.AreEqual(vecCheck.y, vecReturned.y, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on y component");
+            Assert.AreEqual(vecCheck.z, vecReturned.z, VECTOR_COMPONENT_ACCURACY,
+                "TestllSetPrimitiveParams " + msg + " vector check fail on z component");
+        }
+
+        [Test]
         // llVecNorm test.
         public void TestllVecNorm()
         {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
new file mode 100644
index 0000000..7573dff
--- /dev/null
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -0,0 +1,229 @@
+/*
+ * 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.Collections.Generic;
+using System.Reflection;
+using System.Text;
+using log4net;
+using Nini.Config;
+using NUnit.Framework;
+using OpenMetaverse;
+using OpenMetaverse.Assets;
+using OpenMetaverse.StructuredData;
+using OpenSim.Framework;
+using OpenSim.Region.CoreModules.Avatar.AvatarFactory;
+using OpenSim.Region.OptionalModules.World.NPC;
+using OpenSim.Region.Framework.Scenes;
+using OpenSim.Region.ScriptEngine.Shared;
+using OpenSim.Region.ScriptEngine.Shared.Api;
+using OpenSim.Services.Interfaces;
+using OpenSim.Tests.Common;
+using OpenSim.Tests.Common.Mock;
+
+namespace OpenSim.Region.ScriptEngine.Shared.Tests
+{
+    /// <summary>
+    /// Tests for OSSL_Api
+    /// </summary>
+    [TestFixture]
+    public class OSSL_ApiAppearanceTest
+    {
+        protected Scene m_scene;
+        protected XEngine.XEngine m_engine;
+
+        [SetUp]
+        public void SetUp()
+        {
+            IConfigSource initConfigSource = new IniConfigSource();
+            IConfig config = initConfigSource.AddConfig("XEngine");
+            config.Set("Enabled", "true");
+            config.Set("AllowOSFunctions", "true");
+            config.Set("OSFunctionThreatLevel", "Severe");
+            config = initConfigSource.AddConfig("NPC");
+            config.Set("Enabled", "true");
+
+            m_scene = SceneHelpers.SetupScene();
+            SceneHelpers.SetupSceneModules(m_scene, initConfigSource, new AvatarFactoryModule(), new NPCModule());
+
+            m_engine = new XEngine.XEngine();
+            m_engine.Initialise(initConfigSource);
+            m_engine.AddRegion(m_scene);
+        }
+
+        /// <summary>
+        /// Test creation of an NPC where the appearance data comes from a notecard
+        /// </summary>
+        [Test]
+        public void TestOsNpcCreateFromNotecard()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // Store an avatar with a different height from default in a notecard.
+            UUID userId = TestHelpers.ParseTail(0x1);
+            float newHeight = 1.9f;
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+            sp.Appearance.AvatarHeight = newHeight;
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectPart part = so.RootPart;
+            m_scene.AddSceneObject(so);
+
+            OSSL_Api osslApi = new OSSL_Api();
+            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+            string notecardName = "appearanceNc";
+            osslApi.osOwnerSaveAppearance(notecardName);
+
+            // Try creating a bot using the appearance in the notecard.
+            string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName);
+            Assert.That(npcRaw, Is.Not.Null);
+
+            UUID npcId = new UUID(npcRaw);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+            Assert.That(npc, Is.Not.Null);
+            Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
+        }
+
+        /// <summary>
+        /// Test creation of an NPC where the appearance data comes from an avatar already in the region.
+        /// </summary>
+        [Test]
+        public void TestOsNpcCreateFromAvatar()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            // Store an avatar with a different height from default in a notecard.
+            UUID userId = TestHelpers.ParseTail(0x1);
+            float newHeight = 1.9f;
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+            sp.Appearance.AvatarHeight = newHeight;
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectPart part = so.RootPart;
+            m_scene.AddSceneObject(so);
+
+            OSSL_Api osslApi = new OSSL_Api();
+            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+            string notecardName = "appearanceNc";
+            osslApi.osOwnerSaveAppearance(notecardName);
+
+            // Try creating a bot using the existing avatar's appearance
+            string npcRaw = osslApi.osNpcCreate("Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), sp.UUID.ToString());
+            Assert.That(npcRaw, Is.Not.Null);
+
+            UUID npcId = new UUID(npcRaw);
+            ScenePresence npc = m_scene.GetScenePresence(npcId);
+            Assert.That(npc, Is.Not.Null);
+            Assert.That(npc.Appearance.AvatarHeight, Is.EqualTo(newHeight));
+        }
+
+        [Test]
+        public void TestOsOwnerSaveAppearance()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            UUID userId = TestHelpers.ParseTail(0x1);
+            float newHeight = 1.9f;
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
+            sp.Appearance.AvatarHeight = newHeight;
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectPart part = so.RootPart;
+            m_scene.AddSceneObject(so);
+
+            OSSL_Api osslApi = new OSSL_Api();
+            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+            string notecardName = "appearanceNc";
+
+            osslApi.osOwnerSaveAppearance(notecardName);
+
+            IList<TaskInventoryItem> items = part.Inventory.GetInventoryItems(notecardName);
+            Assert.That(items.Count, Is.EqualTo(1));
+
+            TaskInventoryItem ncItem = items[0];
+            Assert.That(ncItem.Name, Is.EqualTo(notecardName));
+
+            AssetBase ncAsset = m_scene.AssetService.Get(ncItem.AssetID.ToString());
+            Assert.That(ncAsset, Is.Not.Null);
+
+            AssetNotecard anc = new AssetNotecard(UUID.Zero, ncAsset.Data);
+            anc.Decode();
+            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(anc.BodyText);
+            AvatarAppearance savedAppearance = new AvatarAppearance();
+            savedAppearance.Unpack(appearanceOsd);
+
+            Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
+        }
+
+        [Test]
+        public void TestOsAgentSaveAppearance()
+        {
+            TestHelpers.InMethod();
+//            log4net.Config.XmlConfigurator.Configure();
+
+            UUID ownerId = TestHelpers.ParseTail(0x1);
+            UUID nonOwnerId = TestHelpers.ParseTail(0x2);
+            float newHeight = 1.9f;
+
+            ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, nonOwnerId);
+            sp.Appearance.AvatarHeight = newHeight;
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId);
+            SceneObjectPart part = so.RootPart;
+            m_scene.AddSceneObject(so);
+
+            OSSL_Api osslApi = new OSSL_Api();
+            osslApi.Initialize(m_engine, part, part.LocalId, part.UUID);
+
+            string notecardName = "appearanceNc";
+
+            osslApi.osAgentSaveAppearance(new LSL_Types.LSLString(nonOwnerId.ToString()), notecardName);
+
+            IList<TaskInventoryItem> items = part.Inventory.GetInventoryItems(notecardName);
+            Assert.That(items.Count, Is.EqualTo(1));
+
+            TaskInventoryItem ncItem = items[0];
+            Assert.That(ncItem.Name, Is.EqualTo(notecardName));
+
+            AssetBase ncAsset = m_scene.AssetService.Get(ncItem.AssetID.ToString());
+            Assert.That(ncAsset, Is.Not.Null);
+
+            AssetNotecard anc = new AssetNotecard(UUID.Zero, ncAsset.Data);
+            anc.Decode();
+            OSDMap appearanceOsd = (OSDMap)OSDParser.DeserializeLLSDXml(anc.BodyText);
+            AvatarAppearance savedAppearance = new AvatarAppearance();
+            savedAppearance.Unpack(appearanceOsd);
+
+            Assert.That(savedAppearance.AvatarHeight, Is.EqualTo(sp.Appearance.AvatarHeight));
+        }
+    }
+}
\ No newline at end of file