diff options
| author | onefang | 2019-09-11 16:36:50 +1000 |
|---|---|---|
| committer | onefang | 2019-09-11 16:36:50 +1000 |
| commit | 50cd1ffd32f69228e566f2b0b89f86ea0d9fe489 (patch) | |
| tree | 52f2ab0c04f1a5d7d6ac5dc872981b4b156447e7 /OpenSim/Region/CoreModules/Asset/Tests | |
| parent | Renamed branch to SledjChisl. (diff) | |
| parent | Bump to release flavour, build 0. (diff) | |
| download | opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.zip opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.gz opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.bz2 opensim-SC_OLD-50cd1ffd32f69228e566f2b0b89f86ea0d9fe489.tar.xz | |
Merge branch 'SledjChisl'
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/Tests')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs index 73e4431..dbb7941 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
| @@ -112,7 +112,7 @@ namespace OpenSim.Region.CoreModules.Asset.Tests | |||
| 112 | { | 112 | { |
| 113 | TestHelpers.InMethod(); | 113 | TestHelpers.InMethod(); |
| 114 | // log4net.Config.XmlConfigurator.Configure(); | 114 | // log4net.Config.XmlConfigurator.Configure(); |
| 115 | 115 | ||
| 116 | AssetBase asset = AssetHelpers.CreateNotecardAsset(); | 116 | AssetBase asset = AssetHelpers.CreateNotecardAsset(); |
| 117 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); | 117 | asset.ID = TestHelpers.ParseTail(0x2).ToString(); |
| 118 | 118 | ||