Merge branch 'master' into careminster

Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
author: Melanie 2012-07-11 03:56:50 +0100
committer: Melanie 2012-07-11 03:56:50 +0100
commit: 0bc8238a6c25bc42438caee0cf42deec00f26b8e (patch)
tree: a046cace418e2e7714818c60242698d0dd9cb4f4 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
parent: Merge branch 'avination' into careminster (diff)
parent: If a part has a sit target and an avatar is already sitting, allow another av... (diff)
download: opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.zip
opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.gz
opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.bz2
opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.xz
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 813e53b..25679a6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -97,11 +97,11 @@ 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);
-            SceneObjectGroup otherSo = SceneHelpers.CreateSceneObject(1, otherUserId);
+            SceneObjectGroup otherSo = SceneHelpers.CreateSceneObject(1, otherUserId, 0x20);
            SceneObjectPart otherPart = otherSo.RootPart;
            m_scene.AddSceneObject(otherSo);
@@ -148,7 +148,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);
author	Melanie	2012-07-11 03:56:50 +0100
committer	Melanie	2012-07-11 03:56:50 +0100
commit	0bc8238a6c25bc42438caee0cf42deec00f26b8e (patch)
tree	a046cace418e2e7714818c60242698d0dd9cb4f4 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
parent	Merge branch 'avination' into careminster (diff)
parent	If a part has a sit target and an avatar is already sitting, allow another av... (diff)
download	opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.zip opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.gz opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.bz2 opensim-SC-0bc8238a6c25bc42438caee0cf42deec00f26b8e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 813e53b..25679a6 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -97,11 +97,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
97	ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);	97	ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
98	sp.Appearance.AvatarHeight = newHeight;	98	sp.Appearance.AvatarHeight = newHeight;
99		99
100	SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);	100	SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
101	SceneObjectPart part = so.RootPart;	101	SceneObjectPart part = so.RootPart;
102	m_scene.AddSceneObject(so);	102	m_scene.AddSceneObject(so);
103		103
104	SceneObjectGroup otherSo = SceneHelpers.CreateSceneObject(1, otherUserId);	104	SceneObjectGroup otherSo = SceneHelpers.CreateSceneObject(1, otherUserId, 0x20);
105	SceneObjectPart otherPart = otherSo.RootPart;	105	SceneObjectPart otherPart = otherSo.RootPart;
106	m_scene.AddSceneObject(otherSo);	106	m_scene.AddSceneObject(otherSo);
107		107
@@ -148,7 +148,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
148		148
149	ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);	149	ScenePresence sp = SceneHelpers.AddScenePresence(m_scene, userId);
150	sp.Appearance.AvatarHeight = newHeight;	150	sp.Appearance.AvatarHeight = newHeight;
151	SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId);	151	SceneObjectGroup so = SceneHelpers.CreateSceneObject(1, userId, 0x10);
152	SceneObjectPart part = so.RootPart;	152	SceneObjectPart part = so.RootPart;
153	m_scene.AddSceneObject(so);	153	m_scene.AddSceneObject(so);
154		154