aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-051-2/+6
|\ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Use the more efficient HashSet instead of List for ↵Justin Clark-Casey (justincc)2012-05-041-1/+1
| | | | | | | | FlotasmAssetCache.m_CurrentlyWriting
| * 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
| | | | | | | | | | This may cause IOErrors on Windows. Aims to help with http://opensimulator.org/mantis/view.php?id=6003
* | Merge branch 'master' into careminsterMelanie2012-04-271-1/+1
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * Add regression test for teleporting an agent between separated regions on ↵Justin Clark-Casey (justincc)2012-04-271-1/+1
| | | | | | | | | | | | | | | | the same simulator. This involves a large amount of change in test scene setup code to allow test scenes to share shared modules SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static May split these out into separate classes in the future.
* | Merge branch 'master' into careminsterMelanie2012-03-081-4/+4
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-4/+4
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * refactor: rename some AssetHelpers.CreateAsset() methods to ↵Justin Clark-Casey (justincc)2011-10-221-4/+4
| | | | | | | | CreateNotecardAsset()
* | 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 ↵Justin Clark-Casey (justincc)2011-08-161-26/+47
| | | | | | | | | | | | | | location rather than copying. Copying doesn't prevent IOExceptions on Windows due to file locking. (e.g. Mantis 5642, 5630). So instead go back to moving the file, swallowing IOExceptions that occur just for the move due to competing caching threads or even different opensimulator instances.
| * Fix a problem in the Flotsam asset cache where assets were being put into ↵Justin Clark-Casey (justincc)2011-08-131-2/+6
| | | | | | | | | | | | | | | | | | the memory cache even when it wasn't enabled. This hopefully addresses http://opensimulator.org/mantis/view.php?id=5634 This is the most probable cause of the memory problems that people have been seeing in the past month. This bug has been around since commit 5dc785b (4th July 2011). Doh! This is why regressions tests are such a good idea... :) Many thanks to Nebadon for using git bisect to track down this bug, which made it a 5 minute fix.
| * 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 ↵Justin Clark-Casey (justincc)2011-08-051-2/+7
| | | | | | | | | | | | disk, copy it instead. This is to eliminate IOException where two threads compete to cache the same file.
| * 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 ↵Justin Clark-Casey (justincc)2011-07-301-26/+24
| | | | | | | | specific stuff to return more information.
| * correct misleading "fcache status" text - deep scans are not performed when ↵Justin Clark-Casey (justincc)2011-07-301-1/+1
| | | | | | | | this command is invoked.
* | 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
| | | | | | | | | | | | | | | | This matches the ability to disable the memory part This is controlled through the FileCacheEnabled parameter in FlotsamCache.ini Default is true, so existing installations are not affected. Improved fcache command feedback when various caches are disabled. Re-enabled test for flotsam cache with file caching disabled.
| * refactor: Split file cache manipulation code into separate methods, as has ↵Justin Clark-Casey (justincc)2011-07-041-102/+131
| | | | | | | | already been done for the memory cache
| * Add basic flotsam asset cache test for retrieved cached asset.Justin Clark-Casey (justincc)2011-07-042-0/+84
| | | | | | | | Disabled temporarily since file system caching disrupts subsequent test runs
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-39/+60
|\ \ | |/
| * If the flotsam asset cache console command "fcache clear" is specified on ↵Justin Clark-Casey (justincc)2011-06-111-11/+26
| | | | | | | | its own, clear both memory and file caches
| * Make the internal flotsam asset cache defaults match ↵Justin Clark-Casey (justincc)2011-06-111-29/+35
| | | | | | | | | | | | | | | | | | config-include/FlotsamCache.ini.example. Enable the flotsam console commands even if FlotsamCache.ini isn't present. For the most part, defaults are made to match those already in FlotsamCache.ini.example. The one exception is that the 48 hour file timeout from the code is used instead of the 0 hours that was in the example file. This can be tweaked if necessary. Most importantly, the default cache directory is now ./assetcache (as in FlotsamCache.ini.example) rather than ./FlotsamAssetCache (as was the internal code default). Therefore, if you were using flotasm without using the config file, then please rename your cache directory or start using the ini file and change the default there if you want to keep using your existing cache.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-271-15/+6
|\ \ | |/
| * Make the file expiration defaults the same whether the whole [FLOTSAM ASSET ↵Justin Clark-Casey (justincc)2011-02-251-3/+3
| | | | | | | | CACHE] section is missing or just the particular config values
| * instead of using different default memory expiration depending on whether ↵Justin Clark-Casey (justincc)2011-02-251-11/+2
| | | | | | | | | | | | there is a [FLOTSAM ASSET CACHE] section present at all, use the same default all the time this simplifies the code
| * log actual cache directory for FlotsamAssetCache instead of always logging ↵Justin Clark-Casey (justincc)2011-02-251-1/+1
| | | | | | | | the default
| * Fix bug where having no maximum memory cache timeout would cause the flotsam ↵Justin Clark-Casey (justincc)2011-02-251-1/+1
| | | | | | | | | | | | asset cache to try using Double.MaxValue, which would cause the underlying OpenMetaverse.ExpiringCache to choke. There is probably an underlying bug to fix in ExpiringCache.
| * Add linden prim renderer and update libOMVMelanie2010-10-041-2/+2
| |
| * * Adds IAssetService.GetCached() to allow asset fetching from the local ↵John Hurliman2010-04-081-0/+5
| | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership()
* | 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 ↵John Hurliman2010-03-151-1/+1
|/ | | | | | types are inferred from context * OAR saving will attempt to correct unknown asset types before writing broken assets to the OAR file
* minor: Make FlotsamAssetCache default loglevel 0 to match that given in ↵Justin Clark-Casey (justincc)2010-02-191-2/+2
| | | | bin/config-include/FlotsamCache.ini.example
* 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
| | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector.
* Revert "Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-3/+1
| | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)" This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules) This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16.
* Old OpenSim installations may have no AssetCaching setting in ↵Justin Clark-Casey (justincc)2010-02-051-1/+3
| | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example) Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects
* Apply http://opensimulator.org/mantis/view.php?id=4548Justin Clark-Casey (justincc)2010-01-291-1/+1
| | | | | Fix command params check on fcache expire <datetime> Thanks coyled
* minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2009-11-091-1/+1
|
generated by cgit v1.1 at 2024-12-28 22:48:28 +0000