diff options
author | Melanie | 2013-12-16 22:11:03 +0000 |
---|---|---|
committer | Melanie | 2013-12-16 22:11:03 +0000 |
commit | fe01e7d1cce9d875b5989931b9652e4cd00c311d (patch) | |
tree | d7e12171d5952d5a96c3f405a5d80c6eebb00937 /OpenSim/Region/ScriptEngine/Shared | |
parent | This is the acutal sitting avatar crossing code. This commit implements the (diff) | |
parent | Merge branch 'justincc-master' (diff) | |
download | opensim-SC-fe01e7d1cce9d875b5989931b9652e4cd00c311d.zip opensim-SC-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.gz opensim-SC-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.bz2 opensim-SC-fe01e7d1cce9d875b5989931b9652e4cd00c311d.tar.xz |
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared')
-rw-r--r-- | OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs | 2 |
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)); |