diff options
| author | Melanie | 2010-08-25 23:22:23 +0100 |
|---|---|---|
| committer | Melanie | 2010-08-25 23:22:23 +0100 |
| commit | 252e159340575cb75b35091ff5d6c5b8fa9beed7 (patch) | |
| tree | 8e77d58e98ad74a47daec298d7488e19e6797748 /OpenSim/Data/Tests | |
| parent | Prevent an object disposed exception that made forms comms unreliable. After (diff) | |
| parent | Prevent an object disposed exception that made forms comms unreliable. After (diff) | |
| download | opensim-SC-252e159340575cb75b35091ff5d6c5b8fa9beed7.zip opensim-SC-252e159340575cb75b35091ff5d6c5b8fa9beed7.tar.gz opensim-SC-252e159340575cb75b35091ff5d6c5b8fa9beed7.tar.bz2 opensim-SC-252e159340575cb75b35091ff5d6c5b8fa9beed7.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/Tests/EstateTests.cs | 6 | ||||
| -rw-r--r-- | OpenSim/Data/Tests/InventoryTests.cs | 4 | ||||
| -rw-r--r-- | OpenSim/Data/Tests/RegionTests.cs | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/OpenSim/Data/Tests/EstateTests.cs b/OpenSim/Data/Tests/EstateTests.cs index d6eed3d..fbf8ba6 100644 --- a/OpenSim/Data/Tests/EstateTests.cs +++ b/OpenSim/Data/Tests/EstateTests.cs | |||
| @@ -37,11 +37,6 @@ using log4net; | |||
| 37 | using System.Reflection; | 37 | using System.Reflection; |
| 38 | using System.Data.Common; | 38 | using System.Data.Common; |
| 39 | 39 | ||
| 40 | #if !NUNIT25 | ||
| 41 | using NUnit.Framework.SyntaxHelpers; | ||
| 42 | #endif | ||
| 43 | |||
| 44 | |||
| 45 | // DBMS-specific: | 40 | // DBMS-specific: |
| 46 | using MySql.Data.MySqlClient; | 41 | using MySql.Data.MySqlClient; |
| 47 | using OpenSim.Data.MySQL; | 42 | using OpenSim.Data.MySQL; |
| @@ -52,7 +47,6 @@ using OpenSim.Data.MSSQL; | |||
| 52 | using Mono.Data.Sqlite; | 47 | using Mono.Data.Sqlite; |
| 53 | using OpenSim.Data.SQLite; | 48 | using OpenSim.Data.SQLite; |
| 54 | 49 | ||
| 55 | |||
| 56 | namespace OpenSim.Data.Tests | 50 | namespace OpenSim.Data.Tests |
| 57 | { | 51 | { |
| 58 | 52 | ||
diff --git a/OpenSim/Data/Tests/InventoryTests.cs b/OpenSim/Data/Tests/InventoryTests.cs index c22e26c..3205bfa 100644 --- a/OpenSim/Data/Tests/InventoryTests.cs +++ b/OpenSim/Data/Tests/InventoryTests.cs | |||
| @@ -37,10 +37,6 @@ using log4net; | |||
| 37 | using System.Reflection; | 37 | using System.Reflection; |
| 38 | using System.Data.Common; | 38 | using System.Data.Common; |
| 39 | 39 | ||
| 40 | #if !NUNIT25 | ||
| 41 | using NUnit.Framework.SyntaxHelpers; | ||
| 42 | #endif | ||
| 43 | |||
| 44 | // DBMS-specific: | 40 | // DBMS-specific: |
| 45 | using MySql.Data.MySqlClient; | 41 | using MySql.Data.MySqlClient; |
| 46 | using OpenSim.Data.MySQL; | 42 | using OpenSim.Data.MySQL; |
diff --git a/OpenSim/Data/Tests/RegionTests.cs b/OpenSim/Data/Tests/RegionTests.cs index 3cd9e0b..29bf5a3 100644 --- a/OpenSim/Data/Tests/RegionTests.cs +++ b/OpenSim/Data/Tests/RegionTests.cs | |||
| @@ -40,10 +40,6 @@ using log4net; | |||
| 40 | using System.Reflection; | 40 | using System.Reflection; |
| 41 | using System.Data.Common; | 41 | using System.Data.Common; |
| 42 | 42 | ||
| 43 | #if !NUNIT25 | ||
| 44 | using NUnit.Framework.SyntaxHelpers; | ||
| 45 | #endif | ||
| 46 | |||
| 47 | // DBMS-specific: | 43 | // DBMS-specific: |
| 48 | using MySql.Data.MySqlClient; | 44 | using MySql.Data.MySqlClient; |
| 49 | using OpenSim.Data.MySQL; | 45 | using OpenSim.Data.MySQL; |