aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Asset (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-311-39/+29
|\ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * In the flotasm asset cache, if we get a request for a file that we're ↵Justin Clark-Casey (justincc)2013-03-301-25/+27
| | | | | | | | actively writing, simply return null instead of first logging an exception.
* | Merge branch 'avination' into careminsterMelanie2013-03-231-2/+15
|\ \ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | 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
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
| * | Don't allow exceptions to propogate from FlotsamAssetCache which may occur ↵Justin Clark-Casey (justincc)2013-02-081-32/+57
| | | | | | | | | | | | | | | | | | when deleting expired files or stamping the region status file. Changes various error level log lines to warn since these are not fatal to the operation of OpenSimulator
* | | Merge branch 'master' into careminsterMelanie2013-02-041-15/+26
|\ \ \ | |/ /
| * | Log missing assets on "fcache assets" found. This ignores references found ↵Justin Clark-Casey (justincc)2013-02-021-15/+26
| | | | | | | | | | | | | | | | | | | | | | | | by scanning LSL/notecard files since these are the source of false positives. This also changes UuidGatherer to reutn an AssetType.Unknown for embedded script/lsl references instead of Texture, since these are often not textures. This is added to help people in determining when they have missing assets such as textures, etc. In this case, one wants to run "fcache clear" first.
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | cache without actually loading it. Make use limited use of it in avatarfactory textures check. Also on llclientview HandleAgentTextureCached that now should work. Other asset cache modules for now will return false, so are broken. baked textures logic still unchanged. *UNTESTED*
* | | Merge branch 'master' into careminsterMelanie2012-12-071-1/+3
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | minor: Fix more compiler warnings in CoreModules tests by properly ↵Justin Clark-Casey (justincc)2012-12-051-1/+3
| | | | | | | | | | | | overriding OpenSimTestCase.SetUp()
* | | Merge branch 'master' into careminsterMelanie2012-11-251-1/+1
|\ \ \ | |/ / | | / | |/ |/| | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
| * Consistenly make NUnit test cases inherit from OpenSimTestCase which ↵Justin Clark-Casey (justincc)2012-11-241-1/+1
| | | | | | | | automatically turns off any logging enabled between tests
* | Merge branch 'master' into careminsterMelanie2012-11-151-4/+2
|\ \ | |/
| * Possibly fixes mantis #6429 (Flotsam cache having a null ref to the asset ↵Diva Canto2012-11-141-4/+2
| | | | | | | | service)
* | Merge branch 'master' into careminsterMelanie2012-11-133-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * Another 21 modules' directives moved out of .addin.xmlDiva Canto2012-11-133-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-11-131-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
| * 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
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * Cleaning up some confusion with Addin names introduced in a prior commit. ↵Diva Canto2012-11-101-2/+2
| | | | | | | | Also the Flotsam cache module was being given a different Addin name, I removed that.
* | Merge branch 'master' into careminsterMelanie2012-09-161-20/+17
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * For FlotsamAssetCache, always update access times of cached scene assets ↵Justin Clark-Casey (justincc)2012-09-151-20/+17
| | | | | | | | | | | | | | | | before looking for files to expire. This is to resolve a problem where an asset marked as local but not temporary but still used in the scene would be removed. The timed expiry scan no longer tries to refetch assets from the scene that are not currently in the cache - this is not helpful since it just drags a lot of data into the cache that may never be referenced. This removes the DeepScanBeforePurge option since setting this to false will introduce the above problem. This previously had a default of true.
* | Merge branch 'master' into careminsterMelanie2012-09-102-1/+4
|\ \ | |/
| * Adjust namespce of FlotsamCacheBlueWall2012-09-092-2/+1
| | | | | | | | Place FloatsamCache in the same namespace as our other core asset caches
| * Revert "Move addin information to CoreModulePlugin.addin.xml"BlueWall2012-09-092-2/+6
| | | | | | | | | | | | This reverts commit 2ec34580ce3807cede97539488237040e1a8a6cc. Moving the attributes for mono addins back to the source file - this also fixes http://opensimulator.org/mantis/view.php?id=6278.
* | Merge branch 'master' into careminsterMelanie2012-09-072-6/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Framework/Servers/VersionInfo.cs
| * Move addin information to CoreModulePlugin.addin.xmlBlueWall2012-09-072-6/+2
| | | | | | | | Move the addin information from attributes in the source file to the CoreModulePlugin.xml, which is the standard. This will help us automate addin version dependency information when we make new OpenSim releases.
* | Merge branch 'master' into careminsterMelanie2012-06-211-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini ↵Justin Clark-Casey (justincc)2012-06-201-1/+1
| | | | | | | | | | | | to debug It's perfectly okay not to have this section.
* | 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
| |
generated by cgit v1.1 at 2024-12-19 17:22:37 +0000