diff options
| author | Melanie | 2012-11-25 14:13:50 +0000 |
|---|---|---|
| committer | Melanie | 2012-11-25 14:13:50 +0000 |
| commit | fd7a83f439132062d500471830eb26e7183d30bc (patch) | |
| tree | db581710c1a370ee4f5ac7a3b2f0dfc9bcbd5457 /OpenSim/Data/Tests/AssetTests.cs | |
| parent | Merge branch 'careminster' into avination (diff) | |
| parent | Combine TestDeleteSceneObjectAsync() with TestDeRezSceneObject() as they are ... (diff) | |
| download | opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.zip opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.gz opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.bz2 opensim-SC-fd7a83f439132062d500471830eb26e7183d30bc.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
Diffstat (limited to 'OpenSim/Data/Tests/AssetTests.cs')
| -rw-r--r-- | OpenSim/Data/Tests/AssetTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/Tests/AssetTests.cs b/OpenSim/Data/Tests/AssetTests.cs index 1174e2f..8cb2ee0 100644 --- a/OpenSim/Data/Tests/AssetTests.cs +++ b/OpenSim/Data/Tests/AssetTests.cs | |||
| @@ -49,7 +49,7 @@ using OpenSim.Data.SQLite; | |||
| 49 | namespace OpenSim.Data.Tests | 49 | namespace OpenSim.Data.Tests |
| 50 | { | 50 | { |
| 51 | [TestFixture(Description = "Asset store tests (SQLite)")] | 51 | [TestFixture(Description = "Asset store tests (SQLite)")] |
| 52 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> | 52 | public class SQLiteAssetTests : AssetTests<SqliteConnection, SQLiteAssetData> |
| 53 | { | 53 | { |
| 54 | } | 54 | } |
| 55 | 55 | ||