Merge branch 'master' into careminster

Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
author: Melanie 2013-11-23 19:13:22 +0000
committer: Melanie 2013-11-23 19:13:22 +0000
commit: 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
tree: a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/CoreModules/Scripting/VectorRender
parent: Merge branch 'master' into careminster (diff)
parent: Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download: opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2
opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
index 41baccc..7119137 100644
--- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
+++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
            TestHelpers.InMethod();
            string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
            SetupScene(false);
            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
            TestHelpers.InMethod();
            string dtText
-                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";
+                = "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
            SetupScene(true);
            SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
author	Melanie	2013-11-23 19:13:22 +0000
committer	Melanie	2013-11-23 19:13:22 +0000
commit	3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch)
tree	a833014a1fedd774e7a9a01cd89a7edddb4210ba /OpenSim/Region/CoreModules/Scripting/VectorRender
parent	Merge branch 'master' into careminster (diff)
parent	Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff)
download	opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC_OLD-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz

diff --git a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs index 41baccc..7119137 100644 --- a/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs +++ b/OpenSim/Region/CoreModules/Scripting/VectorRender/Tests/VectorRenderModuleTests.cs
@@ -152,7 +152,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
152	TestHelpers.InMethod();	152	TestHelpers.InMethod();
153		153
154	string dtText	154	string dtText
155	= "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";	155	= "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
156		156
157	SetupScene(false);	157	SetupScene(false);
158	SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);	158	SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);
@@ -307,7 +307,7 @@ namespace OpenSim.Region.CoreModules.Scripting.VectorRender.Tests
307	TestHelpers.InMethod();	307	TestHelpers.InMethod();
308		308
309	string dtText	309	string dtText
310	= "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://localhost/shouldnotexist.png";	310	= "PenColour BLACK; MoveTo 40,220; FontSize 32; Text Hello World; Image http://0.0.0.0/shouldnotexist.png";
311		311
312	SetupScene(true);	312	SetupScene(true);
313	SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);	313	SceneObjectGroup so = SceneHelpers.AddSceneObject(m_scene);