diff options
| author | Robert Adams | 2013-12-17 06:18:13 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-12-17 06:18:13 -0800 |
| commit | 6937eec2588fab5e73c3ddc74c4ddc1bb35e7527 (patch) | |
| tree | 4372b6dfa7f2e277312c0547a099f6ffeea6e91f /OpenSim/Region/ScriptEngine/Shared | |
| parent | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z. (diff) | |
| parent | Fix issue with editing notes for other avatars (diff) | |
| download | opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.zip opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.gz opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.bz2 opensim-SC-6937eec2588fab5e73c3ddc74c4ddc1bb35e7527.tar.xz | |
Merge branch 'master' into varregion
Add new region crossing code to varregion
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
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)); |