aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ScriptEngine/Shared/Tests
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/ScriptEngine/Shared/Tests')
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs6
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs4
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs8
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs28
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs10
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs2
-rw-r--r--OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs4
11 files changed, 39 insertions, 39 deletions
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
index 30dc4cd..4dc8fc6 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiHttpTests.cs
@@ -112,7 +112,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
112 public void TearDown() 112 public void TearDown()
113 { 113 {
114 MainServer.Instance.Stop(); 114 MainServer.Instance.Stop();
115 } 115 }
116 116
117 [Test] 117 [Test]
118 public void TestLlReleaseUrl() 118 public void TestLlReleaseUrl()
@@ -204,8 +204,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
204 // Check that request to URL works. 204 // Check that request to URL works.
205 string testResponse = "Hello World"; 205 string testResponse = "Hello World";
206 206
207 m_engine.ClearPostedEvents(); 207 m_engine.ClearPostedEvents();
208 m_engine.PostEventHook 208 m_engine.PostEventHook
209 += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); 209 += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
210 210
211// Console.WriteLine("Trying {0}", returnedUri); 211// Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
index 9b7cab2..d652b0d1 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiInventoryTests.cs
@@ -160,7 +160,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
160 // Item has copy permissions so original should stay intact. 160 // Item has copy permissions so original should stay intact.
161 List<TaskInventoryItem> originalItems = so1.RootPart.Inventory.GetInventoryItems(); 161 List<TaskInventoryItem> originalItems = so1.RootPart.Inventory.GetInventoryItems();
162 Assert.That(originalItems.Count, Is.EqualTo(1)); 162 Assert.That(originalItems.Count, Is.EqualTo(1));
163 163
164 // Should now have copied. 164 // Should now have copied.
165 List<TaskInventoryItem> copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName); 165 List<TaskInventoryItem> copiedItems = so2.RootPart.Inventory.GetInventoryItems(inventoryItemName);
166 Assert.That(copiedItems.Count, Is.EqualTo(1)); 166 Assert.That(copiedItems.Count, Is.EqualTo(1));
@@ -194,7 +194,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
194 194
195 api.llGiveInventory(user2Id.ToString(), inventoryItemName); 195 api.llGiveInventory(user2Id.ToString(), inventoryItemName);
196 196
197 InventoryItemBase receivedItem 197 InventoryItemBase receivedItem
198 = UserInventoryHelpers.GetInventoryItem( 198 = UserInventoryHelpers.GetInventoryItem(
199 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); 199 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
200 200
@@ -222,7 +222,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
222 222
223 // Create an object embedded inside the first 223 // Create an object embedded inside the first
224 UUID itemId = TestHelpers.ParseTail(0x20); 224 UUID itemId = TestHelpers.ParseTail(0x20);
225 TaskInventoryItem tii 225 TaskInventoryItem tii
226 = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id); 226 = TaskInventoryHelpers.AddSceneObject(m_scene.AssetService, so1.RootPart, inventoryItemName, itemId, user1Id);
227 tii.NextPermissions &= ~((uint)PermissionMask.Modify); 227 tii.NextPermissions &= ~((uint)PermissionMask.Modify);
228 228
@@ -230,7 +230,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
230 230
231 api.llGiveInventory(user2Id.ToString(), inventoryItemName); 231 api.llGiveInventory(user2Id.ToString(), inventoryItemName);
232 232
233 InventoryItemBase receivedItem 233 InventoryItemBase receivedItem
234 = UserInventoryHelpers.GetInventoryItem( 234 = UserInventoryHelpers.GetInventoryItem(
235 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName)); 235 m_scene.InventoryService, user2Id, string.Format("Objects/{0}", inventoryItemName));
236 236
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
index 14b1890..435a95f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiLinkingTests.cs
@@ -127,7 +127,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
127 TaskInventoryItem grp1Item 127 TaskInventoryItem grp1Item
128 = TaskInventoryHelpers.AddNotecard( 128 = TaskInventoryHelpers.AddNotecard(
129 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); 129 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
130 130
131 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 131 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
132 132
133 LSL_Api apiGrp1 = new LSL_Api(); 133 LSL_Api apiGrp1 = new LSL_Api();
@@ -156,7 +156,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
156 TaskInventoryItem grp1Item 156 TaskInventoryItem grp1Item
157 = TaskInventoryHelpers.AddNotecard( 157 = TaskInventoryHelpers.AddNotecard(
158 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!"); 158 m_scene.AssetService, grp1.RootPart, "ncItem", TestHelpers.ParseTail(0x800), TestHelpers.ParseTail(0x900), "Hello World!");
159 159
160 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS; 160 grp1Item.PermsMask |= ScriptBaseClass.PERMISSION_CHANGE_LINKS;
161 161
162 LSL_Api apiGrp1 = new LSL_Api(); 162 LSL_Api apiGrp1 = new LSL_Api();
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
index 34a29e6..f978138 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiListTests.cs
@@ -37,7 +37,7 @@ using OpenSim.Region.ScriptEngine.Shared.Api;
37using OpenSim.Region.ScriptEngine.Shared.Instance; 37using OpenSim.Region.ScriptEngine.Shared.Instance;
38using OpenSim.Region.ScriptEngine.Shared.ScriptBase; 38using OpenSim.Region.ScriptEngine.Shared.ScriptBase;
39using OpenMetaverse; 39using OpenMetaverse;
40 40
41using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat; 41using LSL_Float = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLFloat;
42using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger; 42using LSL_Integer = OpenSim.Region.ScriptEngine.Shared.LSL_Types.LSLInteger;
43using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list; 43using LSL_List = OpenSim.Region.ScriptEngine.Shared.LSL_Types.list;
@@ -69,7 +69,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
69 m_lslApi = new LSL_Api(); 69 m_lslApi = new LSL_Api();
70 m_lslApi.Initialize(engine, part, null); 70 m_lslApi.Initialize(engine, part, null);
71 } 71 }
72 72
73 [Test] 73 [Test]
74 public void TestllListFindList() 74 public void TestllListFindList()
75 { 75 {
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
index 9ab3115..a341311 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiNotecardTests.cs
@@ -76,7 +76,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
76 76
77 string[] ncLines = { "One", "Twoè", "Three" }; 77 string[] ncLines = { "One", "Twoè", "Three" };
78 78
79 TaskInventoryItem ncItem 79 TaskInventoryItem ncItem
80 = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines)); 80 = TaskInventoryHelpers.AddNotecard(m_scene.AssetService, m_so.RootPart, "nc", "1", "10", string.Join("\n", ncLines));
81 81
82 AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]); 82 AssertValidNotecardLine(ncItem.Name, 0, ncLines[0]);
@@ -111,7 +111,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
111 { 111 {
112 string key = m_lslApi.llGetNotecardLine(ncName, lineNumber); 112 string key = m_lslApi.llGetNotecardLine(ncName, lineNumber);
113 Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString())); 113 Assert.That(key, Is.Not.EqualTo(UUID.Zero.ToString()));
114 114
115 Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1)); 115 Assert.That(m_engine.PostedEvents.Count, Is.EqualTo(1));
116 Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID)); 116 Assert.That(m_engine.PostedEvents.ContainsKey(m_scriptItem.ItemID));
117 117
@@ -223,8 +223,8 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
223// // Check that request to URL works. 223// // Check that request to URL works.
224// string testResponse = "Hello World"; 224// string testResponse = "Hello World";
225// 225//
226// m_engine.ClearPostedEvents(); 226// m_engine.ClearPostedEvents();
227// m_engine.PostEventHook 227// m_engine.PostEventHook
228// += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse); 228// += (itemId, evp) => m_lslApi.llHTTPResponse(evp.Params[0].ToString(), 200, testResponse);
229// 229//
230//// Console.WriteLine("Trying {0}", returnedUri); 230//// Console.WriteLine("Trying {0}", returnedUri);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
index d957bf2..b994901 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiObjectTests.cs
@@ -93,7 +93,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
93 93
94 // Check simple 1 prim case 94 // Check simple 1 prim case
95 { 95 {
96 LSL_List resList 96 LSL_List resList
97 = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 97 = apiGrp1.llGetLinkPrimitiveParams(1, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
98 98
99 Assert.That(resList.Length, Is.EqualTo(1)); 99 Assert.That(resList.Length, Is.EqualTo(1));
@@ -101,11 +101,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
101 101
102 // Check 2 prim case 102 // Check 2 prim case
103 { 103 {
104 LSL_List resList 104 LSL_List resList
105 = apiGrp1.llGetLinkPrimitiveParams( 105 = apiGrp1.llGetLinkPrimitiveParams(
106 1, 106 1,
107 new LSL_List( 107 new LSL_List(
108 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 108 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
109 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 109 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
110 new LSL_Integer(2), 110 new LSL_Integer(2),
111 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 111 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
115 115
116 // Check invalid parameters are ignored 116 // Check invalid parameters are ignored
117 { 117 {
118 LSL_List resList 118 LSL_List resList
119 = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 119 = apiGrp1.llGetLinkPrimitiveParams(3, new LSL_List(new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
120 120
121 Assert.That(resList.Length, Is.EqualTo(0)); 121 Assert.That(resList.Length, Is.EqualTo(0));
@@ -123,11 +123,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
123 123
124 // Check all parameters are ignored if an initial bad link is given 124 // Check all parameters are ignored if an initial bad link is given
125 { 125 {
126 LSL_List resList 126 LSL_List resList
127 = apiGrp1.llGetLinkPrimitiveParams( 127 = apiGrp1.llGetLinkPrimitiveParams(
128 3, 128 3,
129 new LSL_List( 129 new LSL_List(
130 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 130 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
131 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 131 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
132 new LSL_Integer(1), 132 new LSL_Integer(1),
133 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 133 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -137,11 +137,11 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
137 137
138 // Check only subsequent parameters are ignored when we hit the first bad link number 138 // Check only subsequent parameters are ignored when we hit the first bad link number
139 { 139 {
140 LSL_List resList 140 LSL_List resList
141 = apiGrp1.llGetLinkPrimitiveParams( 141 = apiGrp1.llGetLinkPrimitiveParams(
142 1, 142 1,
143 new LSL_List( 143 new LSL_List(
144 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION), 144 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION),
145 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET), 145 new LSL_Integer(ScriptBaseClass.PRIM_LINK_TARGET),
146 new LSL_Integer(3), 146 new LSL_Integer(3),
147 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION))); 147 new LSL_Integer(ScriptBaseClass.PRIM_ROTATION)));
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
197 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 197 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
198 0.90f, // Prim hollow 198 0.90f, // Prim hollow
199 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist 199 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim twist
200 new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper 200 new LSL_Types.Vector3(2.0d, 1.0d, 0.0d), // Prim taper
201 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 201 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
202 0.90f); // Prim hollow check 202 0.90f); // Prim hollow check
203 203
@@ -211,7 +211,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut 211 new LSL_Types.Vector3(0.0d, 1.0d, 0.0d), // Prim cut
212 0.99f, // Prim hollow 212 0.99f, // Prim hollow
213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist 213 new LSL_Types.Vector3(1.0d, 0.0d, 0.0d), // Prim twist
214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper 214 new LSL_Types.Vector3(1.0d, 1.0d, 0.0d), // Prim taper
215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 215 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
216 0.99f); // Prim hollow check 216 0.99f); // Prim hollow check
217 217
@@ -252,7 +252,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist 252 new LSL_Types.Vector3(0.7d + 0.2d, 0.0d, 0.0d), // Prim twist
253 // Expression for y selected to test precision problems during sbyte 253 // Expression for y selected to test precision problems during sbyte
254 // cast in SetPrimitiveShapeParams. 254 // cast in SetPrimitiveShapeParams.
255 new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper 255 new LSL_Types.Vector3(2.0d, (1.3d + 0.1d), 0.0d), // Prim taper
256 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear 256 new LSL_Types.Vector3(0.0d, 0.0d, 0.0d), // Prim shear
257 0.70f); // Prim hollow check 257 0.70f); // Prim hollow check
258 258
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
index d929da8..98800d0 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
@@ -88,19 +88,19 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
88 CheckllAngleBetween(new Vector3(1, 1, 1), 0, 1, 1); 88 CheckllAngleBetween(new Vector3(1, 1, 1), 0, 1, 1);
89 CheckllAngleBetween(new Vector3(1, 1, 1), 90, 1, 1); 89 CheckllAngleBetween(new Vector3(1, 1, 1), 90, 1, 1);
90 CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1); 90 CheckllAngleBetween(new Vector3(1, 1, 1), 180, 1, 1);
91 91
92 CheckllAngleBetween(new Vector3(1, 0, 0), 0, 1.6f, 1.8f); 92 CheckllAngleBetween(new Vector3(1, 0, 0), 0, 1.6f, 1.8f);
93 CheckllAngleBetween(new Vector3(1, 0, 0), 90, 0.3f, 3.9f); 93 CheckllAngleBetween(new Vector3(1, 0, 0), 90, 0.3f, 3.9f);
94 CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f); 94 CheckllAngleBetween(new Vector3(1, 0, 0), 180, 8.8f, 7.4f);
95 95
96 CheckllAngleBetween(new Vector3(0, 1, 0), 0, 9.8f, -9.4f); 96 CheckllAngleBetween(new Vector3(0, 1, 0), 0, 9.8f, -9.4f);
97 CheckllAngleBetween(new Vector3(0, 1, 0), 90, 8.4f, -8.2f); 97 CheckllAngleBetween(new Vector3(0, 1, 0), 90, 8.4f, -8.2f);
98 CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f); 98 CheckllAngleBetween(new Vector3(0, 1, 0), 180, 0.4f, -5.8f);
99 99
100 CheckllAngleBetween(new Vector3(0, 0, 1), 0, -6.8f, 3.4f); 100 CheckllAngleBetween(new Vector3(0, 0, 1), 0, -6.8f, 3.4f);
101 CheckllAngleBetween(new Vector3(0, 0, 1), 90, -3.6f, 5.6f); 101 CheckllAngleBetween(new Vector3(0, 0, 1), 90, -3.6f, 5.6f);
102 CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f); 102 CheckllAngleBetween(new Vector3(0, 0, 1), 180, -3.8f, 1.1f);
103 103
104 CheckllAngleBetween(new Vector3(1, 1, 1), 0, -7.7f, -2.0f); 104 CheckllAngleBetween(new Vector3(1, 1, 1), 0, -7.7f, -2.0f);
105 CheckllAngleBetween(new Vector3(1, 1, 1), 90, -3.0f, -9.1f); 105 CheckllAngleBetween(new Vector3(1, 1, 1), 90, -3.0f, -9.1f);
106 CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f); 106 CheckllAngleBetween(new Vector3(1, 1, 1), 180, -7.9f, -8.0f);
@@ -246,7 +246,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
246 LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc); 246 LSL_Types.Quaternion newRot = m_lslApi.llEuler2Rot(eulerCalc);
247 // Multiple original quaternion by conjugate of quaternion calculated with angles. 247 // Multiple original quaternion by conjugate of quaternion calculated with angles.
248 LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s); 248 LSL_Types.Quaternion check = rot * new LSL_Types.Quaternion(-newRot.x, -newRot.y, -newRot.z, newRot.s);
249 249
250 Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail"); 250 Assert.AreEqual(0.0, check.x, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler X bounds check fail");
251 Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail"); 251 Assert.AreEqual(0.0, check.y, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Y bounds check fail");
252 Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail"); 252 Assert.AreEqual(0.0, check.z, VECTOR_COMPONENT_ACCURACY, "TestllRot2Euler Z bounds check fail");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
index c8c7f82..b2396fa 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLFloat.cs
@@ -155,7 +155,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
155 m_stringDoubleSet.Add("1ef", 1.0); 155 m_stringDoubleSet.Add("1ef", 1.0);
156 m_stringDoubleSet.Add("e10", 0.0); 156 m_stringDoubleSet.Add("e10", 0.0);
157 m_stringDoubleSet.Add("1.e0.0", 1.0); 157 m_stringDoubleSet.Add("1.e0.0", 1.0);
158 158
159 m_doubleStringSet = new Dictionary<double, string>(); 159 m_doubleStringSet = new Dictionary<double, string>();
160 m_doubleStringSet.Add(2.0, "2.000000"); 160 m_doubleStringSet.Add(2.0, "2.000000");
161 m_doubleStringSet.Add(-2.0, "-2.000000"); 161 m_doubleStringSet.Add(-2.0, "-2.000000");
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
index c664108..2bd684f 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLInteger.cs
@@ -131,7 +131,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
131 public void TestImplicitCastBooleanToLSLInteger() 131 public void TestImplicitCastBooleanToLSLInteger()
132 { 132 {
133 TestHelpers.InMethod(); 133 TestHelpers.InMethod();
134 134
135 LSL_Types.LSLInteger testInteger; 135 LSL_Types.LSLInteger testInteger;
136 136
137 testInteger = (1 == 0); 137 testInteger = (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
index 8550f2d..0159b9e 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/LSL_TypesTestLSLString.cs
@@ -125,7 +125,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
125 public void TestImplicitCastBooleanToLSLFloat() 125 public void TestImplicitCastBooleanToLSLFloat()
126 { 126 {
127 TestHelpers.InMethod(); 127 TestHelpers.InMethod();
128 128
129 LSL_Types.LSLString testString; 129 LSL_Types.LSLString testString;
130 130
131 testString = (LSL_Types.LSLString) (1 == 0); 131 testString = (LSL_Types.LSLString) (1 == 0);
diff --git a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
index 99bff83..6936191 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Tests/OSSL_ApiNpcTests.cs
@@ -296,7 +296,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
296 string npcRaw 296 string npcRaw
297 = osslApi.osNpcCreate( 297 = osslApi.osNpcCreate(
298 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED); 298 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_CREATOR_OWNED);
299 299
300 otherOsslApi.osNpcRemove(npcRaw); 300 otherOsslApi.osNpcRemove(npcRaw);
301 301
302 // Should still be around 302 // Should still be around
@@ -340,7 +340,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Tests
340 string npcRaw 340 string npcRaw
341 = osslApi.osNpcCreate( 341 = osslApi.osNpcCreate(
342 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED); 342 "Jane", "Doe", new LSL_Types.Vector3(128, 128, 128), notecardName, ScriptBaseClass.OS_NPC_NOT_OWNED);
343 343
344 osslApi.osNpcRemove(npcRaw); 344 osslApi.osNpcRemove(npcRaw);
345 345
346 UUID npcId = new UUID(npcRaw); 346 UUID npcId = new UUID(npcRaw);