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

author: BlueWall 2013-03-05 15:30:54 -0500
committer: BlueWall 2013-03-05 15:30:54 -0500
commit: f676408e2a45101bcab0a33f598ea9047f02036a (patch)
tree: eb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
parent: Add method to remove JsonRpc Handlers from the server (diff)
parent: * Add a Max Payload size property to the Websocket Server Handler. If you ... (diff)
download: opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2
opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.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	BlueWall	2013-03-05 15:30:54 -0500
committer	BlueWall	2013-03-05 15:30:54 -0500
commit	f676408e2a45101bcab0a33f598ea9047f02036a (patch)
tree	eb34ea8fb0a783ee466873462285eba629ab6405 /OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
parent	Add method to remove JsonRpc Handlers from the server (diff)
parent	* Add a Max Payload size property to the Websocket Server Handler. If you ... (diff)
download	opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.zip opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.gz opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.tar.bz2 opensim-SC-f676408e2a45101bcab0a33f598ea9047f02036a.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