aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Data/SQLite/SQLiteInventoryStore.cs4
-rw-r--r--OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs2
-rw-r--r--OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs2
-rw-r--r--OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs2
-rw-r--r--OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs6
5 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
index ccbd154..7d493ca 100644
--- a/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Data/SQLite/SQLiteInventoryStore.cs
@@ -239,7 +239,7 @@ namespace OpenSim.Data.SQLite
239 if (inventoryRow == null) 239 if (inventoryRow == null)
240 { 240 {
241 if (! add) 241 if (! add)
242 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existant inventory folder: {0}", folder.ID); 242 m_log.ErrorFormat("Interface Misuse: Attempting to Update non-existent inventory folder: {0}", folder.ID);
243 243
244 inventoryRow = inventoryFolderTable.NewRow(); 244 inventoryRow = inventoryFolderTable.NewRow();
245 fillFolderRow(inventoryRow, folder); 245 fillFolderRow(inventoryRow, folder);
@@ -298,7 +298,7 @@ namespace OpenSim.Data.SQLite
298 if (inventoryRow == null) 298 if (inventoryRow == null)
299 { 299 {
300 if (!add) 300 if (!add)
301 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existant inventory item: {0}", item.ID); 301 m_log.ErrorFormat("[INVENTORY DB]: Interface Misuse: Attempting to Update non-existent inventory item: {0}", item.ID);
302 302
303 inventoryRow = inventoryItemTable.NewRow(); 303 inventoryRow = inventoryItemTable.NewRow();
304 fillItemRow(inventoryRow, item); 304 fillItemRow(inventoryRow, item);
diff --git a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
index 9700224..e9aeffe 100644
--- a/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/Linden/UDP/Tests/BasicCircuitTests.cs
@@ -233,7 +233,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
233// testLLUDPServer.RemoveClientCircuit(myCircuitCode); 233// testLLUDPServer.RemoveClientCircuit(myCircuitCode);
234// Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode)); 234// Assert.IsFalse(testLLUDPServer.HasCircuit(myCircuitCode));
235// 235//
236// // Check that removing a non-existant circuit doesn't have any bad effects 236// // Check that removing a non-existent circuit doesn't have any bad effects
237// testLLUDPServer.RemoveClientCircuit(101); 237// testLLUDPServer.RemoveClientCircuit(101);
238// Assert.IsFalse(testLLUDPServer.HasCircuit(101)); 238// Assert.IsFalse(testLLUDPServer.HasCircuit(101));
239// } 239// }
diff --git a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
index d247c7d..00c0ff8 100644
--- a/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
@@ -1541,7 +1541,7 @@ namespace OpenSim.Region.CoreModules.Framework.EntityTransfer
1541 else 1541 else
1542 { 1542 {
1543 // The destination region just doesn't exist 1543 // The destination region just doesn't exist
1544 failureReason = "Cannot cross into non-existant region"; 1544 failureReason = "Cannot cross into non-existent region";
1545 } 1545 }
1546 1546
1547 if (neighbourRegion == null) 1547 if (neighbourRegion == null)
diff --git a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
index 0276b63..55ef61d 100644
--- a/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
+++ b/OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
@@ -858,7 +858,7 @@ namespace OpenSim.Region.CoreModules.World.Land
858 return null; 858 return null;
859 else 859 else
860 throw new Exception( 860 throw new Exception(
861 String.Format("{0} GetLandObject for non-existant position. Region={1}, pos=<{2},{3}", 861 String.Format("{0} GetLandObject for non-existent position. Region={1}, pos=<{2},{3}",
862 LogHeader, m_scene.RegionInfo.RegionName, x, y) 862 LogHeader, m_scene.RegionInfo.RegionName, x, y)
863 ); 863 );
864 } 864 }
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
index bfa9937..21e2758 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/Tests/JsonStoreScriptModuleTests.cs
@@ -465,13 +465,13 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
465 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_VALUE)); 465 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_VALUE));
466 } 466 }
467 467
468 // Test for non-existant path 468 // Test for non-existent path
469 { 469 {
470 int result = (int)InvokeOp("JsonGetNodeType", storeId, "foo"); 470 int result = (int)InvokeOp("JsonGetNodeType", storeId, "foo");
471 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_UNDEF)); 471 Assert.That(result, Is.EqualTo(JsonStoreScriptModule.JSON_NODETYPE_UNDEF));
472 } 472 }
473 473
474 // Test for non-existant store 474 // Test for non-existent store
475 { 475 {
476 UUID fakeStoreId = TestHelpers.ParseTail(0x500); 476 UUID fakeStoreId = TestHelpers.ParseTail(0x500);
477 int result = (int)InvokeOp("JsonGetNodeType", fakeStoreId, "."); 477 int result = (int)InvokeOp("JsonGetNodeType", fakeStoreId, ".");
@@ -898,4 +898,4 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore.Tests
898 898
899 public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; } 899 public object DummyTestMethod(object o1, object o2, object o3, object o4, object o5) { return null; }
900 } 900 }
901} \ No newline at end of file 901}