diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to 'OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs')
| -rw-r--r-- | OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs index 1c2bfd0..c91b25f 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
| @@ -35,6 +35,7 @@ using Nini.Config; | |||
| 35 | using NUnit.Framework; | 35 | using NUnit.Framework; |
| 36 | using OpenMetaverse; | 36 | using OpenMetaverse; |
| 37 | using OpenMetaverse.Assets; | 37 | using OpenMetaverse.Assets; |
| 38 | using Flotsam.RegionModules.AssetCache; | ||
| 38 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 39 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
| 40 | using OpenSim.Region.Framework.Scenes.Serialization; | 41 | using OpenSim.Region.Framework.Scenes.Serialization; |