aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-311-39/+29
|\
| * In the flotasm asset cache, if we get a request for a file that we're activel...Justin Clark-Casey (justincc)2013-03-301-25/+27
* | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \
| * | Make sharing errors not spew and let the cache retry the filesMelanie Thielker2013-03-231-1/+15
* | | Merge branch 'master' into careminsterMelanie2013-02-081-31/+56
|\ \ \ | | |/ | |/|
| * | Don't allow exceptions to propogate from FlotsamAssetCache which may occur wh...Justin Clark-Casey (justincc)2013-02-081-32/+57
* | | Merge branch 'master' into careminsterMelanie2013-02-041-15/+26
|\ \ \ | |/ /
| * | Log missing assets on "fcache assets" found. This ignores references found b...Justin Clark-Casey (justincc)2013-02-021-15/+26
* | | Merge branch 'avination' into careminsterMelanie2012-12-184-0/+90
|\ \ \ | | |/ | |/|
| * | add a Check method to flotsamAssetCache, so to check if a asset is inUbitUmarov2012-12-134-0/+90
* | | Merge branch 'master' into careminsterMelanie2012-12-071-1/+3
|\ \ \ | | |/ | |/|
| * | minor: Fix more compiler warnings in CoreModules tests by properly overriding...Justin Clark-Casey (justincc)2012-12-051-1/+3
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / | | / | |/ |/|
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which automati...Justin Clark-Casey (justincc)2012-11-241-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-151-4/+2
|\ \ | |/
| * Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ser...Diva Canto2012-11-141-4/+2
* | Merge branch 'master' into careminsterMelanie2012-11-133-0/+6
|\ \ | |/
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-133-0/+6
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/
| * Cleanup on region modules: gave short node id's to all of them.Diva Canto2012-11-121-1/+1
* | Merge branch 'master' into careminsterMelanie2012-11-111-2/+2
|\ \ | |/
| * Cleaning up some confusion with Addin names introduced in a prior commit. Als...Diva Canto2012-11-101-2/+2
* | Merge branch 'master' into careminsterMelanie2012-09-161-20/+17
|\ \ | |/
| * For FlotsamAssetCache, always update access times of cached scene assets befo...Justin Clark-Casey (justincc)2012-09-151-20/+17
* | Merge branch 'master' into careminsterMelanie2012-09-102-1/+4
|\ \ | |/
| * Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| * Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-092-2/+6
* | Merge branch 'master' into careminsterMelanie2012-09-072-6/+2
|\ \ | |/
| * Move addin information to CoreModulePlugin.addin.xmlBlueWall2012-09-072-6/+2
* | 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
generated by cgit v1.1 at 2024-08-21 13:59:41 +0000