Dump OpenSim 0.9.0.1 into it's own branch.

3 files changed, 21 insertions, 18 deletions

diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
index b92f3a3..a9f3283 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CSCodeGeneratorTest.cs
@@ -1388,7 +1388,7 @@ default
                 "\n            LSL_Types.list m = new LSL_Types.list(new LSL_Types.LSLInteger(1), new LSL_Types.LSLInteger(2), new LSL_Types.LSLInteger(3));" +
                 "\n            LSL_Types.Vector3 v = new LSL_Types.Vector3(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
                 "\n            LSL_Types.Vector3 w = new LSL_Types.Vector3(new LSL_Types.LSLFloat(1.0), new LSL_Types.LSLFloat(0.1), new LSL_Types.LSLFloat(0.5));" +
-                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0));" +
+                "\n            LSL_Types.Quaternion r = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(0.0), new LSL_Types.LSLFloat(1.0));" +
                 "\n            LSL_Types.Quaternion u = new LSL_Types.Quaternion(new LSL_Types.LSLFloat(0.8), new LSL_Types.LSLFloat(0.7), new LSL_Types.LSLFloat(0.6), llSomeFunc());" +
                 "\n            LSL_Types.LSLString k = new LSL_Types.LSLString(\"\");" +
                 "\n            LSL_Types.LSLString n = new LSL_Types.LSLString(\"ping\");" +
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
index b476e32..12ba4de 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/CompilerTest.cs
@@ -37,6 +37,7 @@ using OpenSim.Tests.Common;
 
 namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 {
+
     /// <summary>
     /// Tests the LSL compiler. Among other things, test that error messages
     /// generated by the C# compiler can be mapped to prper lines/columns in
@@ -80,7 +81,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             m_resolveEventHandler = new ResolveEventHandler(AssemblyResolver.OnAssemblyResolve);
 
             System.AppDomain.CurrentDomain.AssemblyResolve += m_resolveEventHandler;
-                
+
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenSim.Region.ScriptEngine.Shared.Api.Runtime.dll"));
             m_compilerParameters.ReferencedAssemblies.Add(Path.Combine(rootPath, "OpenMetaverseTypes.dll"));
@@ -111,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
             CSCodeGenerator cg = new CSCodeGenerator();
             string output = cg.Convert(input);
 
-            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);         
+            output = Compiler.CreateCSCompilerScript(output, "script1", typeof(ScriptBaseClass).FullName, null);
             //            System.Console.WriteLine(output);
 
             positionMap = cg.PositionMap;
@@ -132,7 +133,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
 
             return compilerResults;
         }
-
+/*  test too depedent on counting lines and columns maping code generation changes
+erros position is better tested on viewers
         /// <summary>
         /// Test that line number errors are resolved as expected when preceding code contains a jump.
         /// </summary>
@@ -152,13 +154,14 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
         @l;
         i = 1;
     }
-}", out positionMap);           
+}", out positionMap);
 
             Assert.AreEqual(
                 new KeyValuePair<int, int>(7, 9),
                 positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
         }
 
+
         /// <summary>
         /// Test the C# compiler error message can be mapped to the correct
         /// line/column in the LSL source when an undeclared variable is used.
@@ -183,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.CodeTools.Tests
                 new KeyValuePair<int, int>(5, 21),
                 positionMap[new KeyValuePair<int, int>(compilerResults.Errors[0].Line, compilerResults.Errors[0].Column)]);
         }
-
+*/
         /// <summary>
         /// Test that a string can be cast to string and another string
         /// concatenated.
diff --git a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
index 67ce10a..220ec72 100644
--- a/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/CodeTools/Tests/LSL_EventTests.cs
@@ -150,7 +150,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("changed");
-        }  
+        }
 
         [Test]
         public void TestCollisionEvent()
@@ -159,7 +159,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision");
-        }  
+        }
 
         [Test]
         public void TestCollisionStartEvent()
@@ -168,7 +168,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision_start");
-        }  
+        }
 
         [Test]
         public void TestCollisionEndEvent()
@@ -177,7 +177,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("collision_end");
-        }  
+        }
 
         [Test]
         public void TestOnRezEvent()
@@ -186,7 +186,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("on_rez");
-        }  
+        }
 
         [Test]
         public void TestRunTimePermissionsEvent()
@@ -195,7 +195,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("run_time_permissions");
-        }  
+        }
 
         [Test]
         public void TestSensorEvent()
@@ -204,7 +204,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("sensor");
-        }  
+        }
 
         [Test]
         public void TestTouchEvent()
@@ -213,7 +213,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch");
-        }  
+        }
 
         [Test]
         public void TestTouchStartEvent()
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch_start");
-        }            
+        }
 
         [Test]
         public void TestTouchEndEvent()
@@ -231,7 +231,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
 //            TestHelpers.EnableLogging();
 
             TestIntArgEvent("touch_end");
-        }  
+        }
 
         [Test]
         public void TestLandCollisionEvent()
@@ -351,8 +351,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
             }
 
             Assert.That(
-                gotException, 
-                Is.EqualTo(expectException), 
+                gotException,
+                Is.EqualTo(expectException),
                 "Failed on {0}, exception {1}", script, ge != null ? ge.ToString() : "n/a");
         }
     }