Merge branch 'master' of ssh://opensimulator.org/var/git/opensim

author: Diva Canto 2013-02-27 20:50:03 -0800
committer: Diva Canto 2013-02-27 20:50:03 -0800
commit: 64b8ce73dabcf651beadcc11cbe94db69cc3ea0e (patch)
tree: ab7f3a63c166185a5fd9d6d5a7e36a18d63a9817 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
parent: Moved the HG default variables out of [Startup] and into their own section [H... (diff)
parent: Add comment to example region modules about need to add Assembly annotation i... (diff)
download: opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.zip
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.gz
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.bz2
opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 1f8a6e5..74f010e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
            // Store an avatar with a different height from default in a notecard.
            UUID userId = TestHelpers.ParseTail(0x1);
            float firstHeight = 1.9f;
-            float secondHeight = 2.1f;
+//            float secondHeight = 2.1f;
            string firstAppearanceNcName = "appearanceNc1";
            string secondAppearanceNcName = "appearanceNc2";
author	Diva Canto	2013-02-27 20:50:03 -0800
committer	Diva Canto	2013-02-27 20:50:03 -0800
commit	64b8ce73dabcf651beadcc11cbe94db69cc3ea0e (patch)
tree	ab7f3a63c166185a5fd9d6d5a7e36a18d63a9817 /OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
parent	Moved the HG default variables out of [Startup] and into their own section [H... (diff)
parent	Add comment to example region modules about need to add Assembly annotation i... (diff)
download	opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.zip opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.gz opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.bz2 opensim-SC-64b8ce73dabcf651beadcc11cbe94db69cc3ea0e.tar.xz

diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs index 1f8a6e5..74f010e 100644 --- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs +++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
222	// Store an avatar with a different height from default in a notecard.	222	// Store an avatar with a different height from default in a notecard.
223	UUID userId = TestHelpers.ParseTail(0x1);	223	UUID userId = TestHelpers.ParseTail(0x1);
224	float firstHeight = 1.9f;	224	float firstHeight = 1.9f;
225	float secondHeight = 2.1f;	225	// float secondHeight = 2.1f;
226	string firstAppearanceNcName = "appearanceNc1";	226	string firstAppearanceNcName = "appearanceNc1";
227	string secondAppearanceNcName = "appearanceNc2";	227	string secondAppearanceNcName = "appearanceNc2";
228		228