From 7ff4eec79cf16886439604a23126abd195ae8b2e Mon Sep 17 00:00:00 2001
From: Justin Clark-Casey (justincc)
Date: Sat, 7 Jul 2012 00:02:45 +0100
Subject: Remove redundant SetScene() function in Scene.AddSceneObject()

This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
---
 .../ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs')

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
index 3965734..c8718d9 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAppearanceTest.cs
@@ -79,7 +79,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         /// Test creation of an NPC where the appearance data comes from a notecard
         /// </summary>
         [Test]
-        public void TestOsNpcCreateFromNotecard()
+        public void TestOsNpcCreateUsingAppearanceFromNotecard()
         {
             TestHelpers.InMethod();
 //            log4net.Config.XmlConfigurator.Configure();
@@ -90,7 +90,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
             sp.Appearance.AvatarHeight = newHeight;
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
             SceneObjectPart part = so.RootPart;
             m_scene.AddSceneObject(so);
 
@@ -114,10 +114,10 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
         /// Test creation of an NPC where the appearance data comes from an avatar already in the region.
         /// </summary>
         [Test]
-        public void TestOsNpcCreateFromAvatar()
+        public void TestOsNpcCreateUsingAppearanceFromAvatar()
         {
             TestHelpers.InMethod();
-//            log4net.Config.XmlConfigurator.Configure();
+//            TestHelpers.EnableLogging();
 
             // Store an avatar with a different height from default in a notecard.
             UUID userId = TestHelpers.ParseTail(0x1);
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
             sp.Appearance.AvatarHeight = newHeight;
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
             SceneObjectPart part = so.RootPart;
             m_scene.AddSceneObject(so);
 
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
             sp.Appearance.AvatarHeight = newHeight;
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
             SceneObjectPart part = so.RootPart;
             m_scene.AddSceneObject(so);
 
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 
             ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, nonOwnerId);
             sp.Appearance.AvatarHeight = newHeight;
-            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId);
+            SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, ownerId, 0x10);
             SceneObjectPart part = so.RootPart;
             m_scene.AddSceneObject(so);
 
-- 
cgit v1.1