diff options
| author | Diva Canto | 2012-09-07 08:10:03 -0700 |
|---|---|---|
| committer | Diva Canto | 2012-09-07 08:10:03 -0700 |
| commit | 2b506cffb16729837fc2ec41a28fef8feaf6428d (patch) | |
| tree | 009a47a191a87525a0817edd1f8fdde9b2058b31 /OpenSim/Region/CoreModules/Asset/Tests | |
| parent | Moved the new vars in Robust.HG.ini to the proper section. (diff) | |
| parent | Move addin information to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.zip opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.gz opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.bz2 opensim-SC_OLD-2b506cffb16729837fc2ec41a28fef8feaf6428d.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
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 c91b25f..9276d1a 100644 --- a/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs +++ b/OpenSim/Region/CoreModules/Asset/Tests/FlotsamAssetCacheTests.cs | |||
| @@ -35,7 +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.Region.CoreModules.Asset; |
| 39 | using OpenSim.Framework; | 39 | using OpenSim.Framework; |
| 40 | using OpenSim.Region.Framework.Scenes; | 40 | using OpenSim.Region.Framework.Scenes; |
| 41 | using OpenSim.Region.Framework.Scenes.Serialization; | 41 | using OpenSim.Region.Framework.Scenes.Serialization; |