aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-06-211-1/+1
|\
| * minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini ...Justin Clark-Casey (justincc)2012-06-201-1/+1
* | Merge branch 'master' into careminsterMelanie2012-05-051-2/+6
|\ \ | |/
| * Use the more efficient HashSet instead of List for FlotasmAssetCache.m_Curren...Justin Clark-Casey (justincc)2012-05-041-1/+1
| * Don't try and update the access time of a file that is actively being cached.Justin Clark-Casey (justincc)2012-05-041-2/+6
* | Merge branch 'master' into careminsterMelanie2012-04-271-1/+1
|\ \ | |/
| * Add regression test for teleporting an agent between separated regions on the...Justin Clark-Casey (justincc)2012-04-271-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-081-4/+4
|\ \ | |/
| * Change "help" to display categories/module list then "help <category/module>"...Justin Clark-Casey (justincc)2012-03-081-4/+4
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to CreateNotecardAss...Justin Clark-Casey (justincc)2011-10-221-4/+4
* | Merge fixes, and fix the buildTom2011-09-141-7/+3
* | Resolve merge commits, stage 1Tom2011-09-042-58/+86
|\ \ | |/
| * minor: change some comment text in flotsam asset cacheJustin Clark-Casey (justincc)2011-08-161-4/+3
| * On Flotsam asset cache, go back to moving the file from the temporary locatio...Justin Clark-Casey (justincc)2011-08-161-26/+47
| * Fix a problem in the Flotsam asset cache where assets were being put into the...Justin Clark-Casey (justincc)2011-08-131-2/+6
| * rename TestHelper => TestHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-6/+6
| * rename test SceneSetupHelpers -> SceneHelpers for consistencyJustin Clark-Casey (justincc)2011-08-061-2/+2
| * refactor: remove a sliver of unnecessary codeJustin Clark-Casey (justincc)2011-08-051-4/+1
| * Instead of moving the file to its final place when FlotsamCache writes to dis...Justin Clark-Casey (justincc)2011-08-051-2/+7
| * Fix Flotsam cache so it will use the disk cache if the memory cache is enabledRobert Adams2011-08-021-2/+2
| * Replace the generic exception logging in flotsam asset cache with more specif...Justin Clark-Casey (justincc)2011-07-301-26/+24
| * correct misleading "fcache status" text - deep scans are not performed when t...Justin Clark-Casey (justincc)2011-07-301-1/+1
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-052-99/+295
|\ \ | |/
| * Add TestClearCache()Justin Clark-Casey (justincc)2011-07-041-0/+17
| * add TestExpireAsset()Justin Clark-Casey (justincc)2011-07-041-0/+20
| * refactor: Move test setup code into setup methodJustin Clark-Casey (justincc)2011-07-041-13/+20
| * Make it possible to disable the file part of the flotsam asset cacheJustin Clark-Casey (justincc)2011-07-042-39/+74
| * refactor: Split file cache manipulation code into separate methods, as has al...Justin Clark-Casey (justincc)2011-07-041-102/+131
| * Add basic flotsam asset cache test for retrieved cached asset.Justin Clark-Casey (justincc)2011-07-042-0/+84
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-39/+60
|\ \ | |/
| * If the flotsam asset cache console command "fcache clear" is specified on its...Justin Clark-Casey (justincc)2011-06-111-11/+26
| * Make the internal flotsam asset cache defaults match config-include/FlotsamCa...Justin Clark-Casey (justincc)2011-06-111-29/+35
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-271-15/+6
|\ \ | |/
| * Make the file expiration defaults the same whether the whole [FLOTSAM ASSET C...Justin Clark-Casey (justincc)2011-02-251-3/+3
| * instead of using different default memory expiration depending on whether the...Justin Clark-Casey (justincc)2011-02-251-11/+2
| * log actual cache directory for FlotsamAssetCache instead of always logging th...Justin Clark-Casey (justincc)2011-02-251-1/+1
| * Fix bug where having no maximum memory cache timeout would cause the flotsam ...Justin Clark-Casey (justincc)2011-02-251-1/+1
| * Add linden prim renderer and update libOMVMelanie2010-10-041-2/+2
| * * Adds IAssetService.GetCached() to allow asset fetching from the local cache...John Hurliman2010-04-081-0/+5
* | Fix casts in llSetPayPriceMelanie2010-12-151-1/+10
* | Add linden prim renderer and update libOMVMelanie2010-10-041-2/+2
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-131-0/+5
|\ \ | |/ |/|
| * Backported GetTextureModule and IAssetService.GetCached()John Hurliman2010-04-081-0/+5
* | * UuidGatherer now tracks asset types for assets it discovers. The asset type...John Hurliman2010-03-151-1/+1
|/
* minor: Make FlotsamAssetCache default loglevel 0 to match that given in bin/c...Justin Clark-Casey (justincc)2010-02-191-2/+2
* Formatting cleanup.Jeff Ames2010-02-151-1/+1
* Fix http://opensimulator.org/mantis/view.php?id=4224Justin Clark-Casey (justincc)2010-02-121-13/+14
* Revert "Old OpenSim installations may have no AssetCaching setting in config-...Justin Clark-Casey (justincc)2010-02-051-3/+1
* Old OpenSim installations may have no AssetCaching setting in config-include/...Justin Clark-Casey (justincc)2010-02-051-1/+3