aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2013-12-14 02:49:23 +0000
committerJustin Clark-Casey (justincc)2013-12-14 02:49:23 +0000
commit00e632ec3a5c5288c1673f360d11317a7ee0d60a (patch)
treed3434dd84f1a1c6ae69c69c28f64e4928ab5f05e /OpenSim/Region
parentMerge branch 'justincc-master' (diff)
parentExtend TestLlGetNotecardLine() regression test to contain chars that are two ... (diff)
downloadopensim-SC-00e632ec3a5c5288c1673f360d11317a7ee0d60a.zip
opensim-SC-00e632ec3a5c5288c1673f360d11317a7ee0d60a.tar.gz
opensim-SC-00e632ec3a5c5288c1673f360d11317a7ee0d60a.tar.bz2
opensim-SC-00e632ec3a5c5288c1673f360d11317a7ee0d60a.tar.xz
Merge branch 'justincc-master'
Diffstat (limited to 'OpenSim/Region')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index c92bcdb..42d1b3b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -75,7 +75,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
75 { 75 {
76 TestHelpers.InMethod(); 76 TestHelpers.InMethod();
77 77
78 string[] ncLines = { "One", "Two", "Three" }; 78 string[] ncLines = { "One", "Twoรจ", "Three" };
79 79
80 TaskInventoryItem ncItem 80 TaskInventoryItem ncItem
81 = TaskInventoryHelpers.AddNotecard(m_scene, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines)); 81 = TaskInventoryHelpers.AddNotecard(m_scene, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));