Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2013-02-28 14:20:31 -0800
committer: Diva Canto 2013-02-28 14:20:31 -0800
commit: 433102108b903669cef632feff871fe9bc37021c (patch)
tree: d530ec4b8164d569a8064b0beaef37cde2f279ae /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
parent: Bug fix in DataSnapshot, where a var was being used before being initialized. (diff)
parent: Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff)
download: opensim-SC-433102108b903669cef632feff871fe9bc37021c.zip
opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.gz
opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.bz2
opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
index 5b57bbe..ac9f93b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            // FIXME: This should really be a script item (with accompanying script)
            TaskInventoryItem grp1Item
                = TaskInventoryHelpers.AddNotecard(
-                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900));
+                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
            grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
            SceneObjectGroup grp2 = SceneHelpers.CreateSceneObject(2, ownerId, "grp2-", 0x20);
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            // FIXME: This should really be a script item (with accompanying script)
            TaskInventoryItem grp1Item
                = TaskInventoryHelpers.AddNotecard(
-                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900));
+                    m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
            
            grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
author	Diva Canto	2013-02-28 14:20:31 -0800
committer	Diva Canto	2013-02-28 14:20:31 -0800
commit	433102108b903669cef632feff871fe9bc37021c (patch)
tree	d530ec4b8164d569a8064b0beaef37cde2f279ae /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
parent	Bug fix in DataSnapshot, where a var was being used before being initialized. (diff)
parent	Fix potential concurrency issue since the LSL notecard cache was not being ch... (diff)
download	opensim-SC-433102108b903669cef632feff871fe9bc37021c.zip opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.gz opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.bz2 opensim-SC-433102108b903669cef632feff871fe9bc37021c.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs index 5b57bbe..ac9f93b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
93	// FIXME: This should really be a script item (with accompanying script)	93	// FIXME: This should really be a script item (with accompanying script)
94	TaskInventoryItem grp1Item	94	TaskInventoryItem grp1Item
95	= TaskInventoryHelpers.AddNotecard(	95	= TaskInventoryHelpers.AddNotecard(
96	m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900));	96	m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
97	grp1Item.PermsMask \|= ScriptBaseClass.PERMISSION_CHANGE_LINKS;	97	grp1Item.PermsMask \|= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
98		98
99	SceneObjectGroup grp2 = SceneHelpers.CreateSceneObject(2, ownerId, "grp2-", 0x20);	99	SceneObjectGroup grp2 = SceneHelpers.CreateSceneObject(2, ownerId, "grp2-", 0x20);
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
127	// FIXME: This should really be a script item (with accompanying script)	127	// FIXME: This should really be a script item (with accompanying script)
128	TaskInventoryItem grp1Item	128	TaskInventoryItem grp1Item
129	= TaskInventoryHelpers.AddNotecard(	129	= TaskInventoryHelpers.AddNotecard(
130	m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900));	130	m_scene, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
131		131
132	grp1Item.PermsMask \|= ScriptBaseClass.PERMISSION_CHANGE_LINKS;	132	grp1Item.PermsMask \|= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
133		133