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/OSSL_ApiAttachmentTests.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, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
index b2803a1..e422f5b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            // Create an object embedded inside the first
            TaskInventoryHelpers.AddNotecard(
-                m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900));
+                m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900), "Hello World!");
            bool exceptionCaught = false;
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/OSSL_ApiAttachmentTests.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/OSSL_ApiAttachmentTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs index b2803a1..e422f5b 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiAttachmentTests.cs
@@ -151,7 +151,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
151		151
152	// Create an object embedded inside the first	152	// Create an object embedded inside the first
153	TaskInventoryHelpers.AddNotecard(	153	TaskInventoryHelpers.AddNotecard(
154	m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900));	154	m_scene, inWorldObj.RootPart, taskInvObjItemName, taskInvObjItemId, TestHelpers.ParseTail(0x900), "Hello World!");
155		155
156	bool exceptionCaught = false;	156	bool exceptionCaught = false;
157		157