aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/AssetService (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
|\ | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| * Bump OPenSimulator version and assembly versions up to 0.8.0 DevJustin Clark-Casey (justincc)2013-10-041-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-06-301-3/+4
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * In XAssetService, on a delete asset request also delete the asset in any ↵Justin Clark-Casey (justincc)2013-06-281-3/+4
| | | | | | | | | | | | chained service. This eliminates the async migration since it causes a race condition with the "delete asset" console command
* | Merge branch 'master' into careminsterMelanie2013-03-153-56/+86
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: Reuse Get() method in AssetService to eliminate some copy/paste in ↵Justin Clark-Casey (justincc)2013-03-151-23/+5
| | | | | | | | other Get methods
| * Migrate assets from chained asset service to xassetservice as they are ↵Justin Clark-Casey (justincc)2013-03-151-28/+20
| | | | | | | | | | | | requested. This shrinks the asset database over time as duplicate assets are fetched.
| * Fix bug in AssetService where requesting data only for an asset would throw ↵Justin Clark-Casey (justincc)2013-03-151-1/+5
| | | | | | | | an exception if the asset did not exist.
| * Make it possible to chain another asset service underneath the ↵Justin Clark-Casey (justincc)2013-03-152-23/+75
| | | | | | | | | | | | | | | | de-duplicating XAssetService. This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand. Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService") Not yet ready for use.
* | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
|\ \ | |/
| * Deleted all AssemblyFileVersion directivesDiva Canto2013-02-191-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-051-1/+1
| | | | | | | | | | | | | | | | This is mostly Bluewall's work but I am also bumping the general version number OpenSimulator 0.7.5 remains in the release candidate stage. I'm doing this because master is significantly adding things that will not be in 0.7.5 This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names and so the exact version match requirement is not in force.
* | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
|\ \ | |/
| * The last few AssemblyInfos. Finished!Diva Canto2012-11-141-0/+33
| |
* | Merge branch 'master' into careminsterMelanie2012-11-032-31/+4
|\ \ | |/
| * Move check to allow only deletion of maptiles up to AssetServerDeleteHandler ↵Justin Clark-Casey (justincc)2012-11-022-31/+4
| | | | | | | | | | | | | | | | from AssetService. This allows us to use a common check for both AssetService and XAssetService. It also allows future console commands to delete an asset. As before, deletion of maptile assets is not allowed remotely unless this is explicitly configured.
* | Merge branch 'master' into careminsterMelanie2012-09-161-2/+2
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/Framework/Scenes/EventManager.cs
| * Add basic asset connector tests to check behaviour for normal, local and ↵Justin Clark-Casey (justincc)2012-09-151-2/+2
| | | | | | | | | | | | | | temporary assets. Make AssetServiceConnector return more useful data on failure, such as what DLL it was trying to load Allow LocalAssetServiceConnector.GetData() to work without a cache present, as works for the other lasc Get* methods.
* | Merge branch 'master' into careminsterMelanie2012-08-032-2/+4
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * minor: Comment out "Deleting asset" log messages for nowJustin Clark-Casey (justincc)2012-08-032-2/+4
| |
* | Merge branch 'master' into careminsterMelanie2012-03-272-6/+20
|\ \ | |/
| * Send the config section name up to the service classes themselves ↵Diva Canto2012-03-272-6/+20
| | | | | | | | (XInventory and Assets).
* | Merge branch 'master' into careminsterMelanie2012-03-202-1/+95
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-192-1/+95
| | | | | | | | | | | | | | | | | | accidentally. The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up. This replaces the changes in 92b1ade. There is no longer any need to adjust your StandaloneCommon.ini/Robust.ini/Robust.HG.ini files. This may explain very recent issues in the last few weeks where textures have been disappearing or turning white (as they were going to different places). Unfortunately, you will need to rollback to an earlier database backup or reupload the textures.
* | Merge branch 'master' into careminsterMelanie2012-03-091-0/+213
|\ \ | |/
| * Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-021-0/+213
| | | | | | | | | | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* | Merge branch 'master' into careminsterMelanie2012-01-061-121/+3
|\ \ | |/ | | | | | | Conflicts: OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
| * Move asset commands from AssetService to AssetServerConnector so that we can ↵Justin Clark-Casey (justincc)2012-01-051-121/+3
| | | | | | | | | | | | harmonise the same commands on the simulator side. No functional change.
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+9
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Damaged assets, especially appearance textures, could crash the region ↵Snoopy Pfeffer2011-11-061-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | server with a fatal exception. Now, such excpetions are caught by an exception handler and just an error message is shown. This was the kind of exception causing these fatal server crashes: APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M ^M Exception: System.ArgumentOutOfRangeException: Argument is out of range. Parameter name: offset exceeds the size of buffer at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0 at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M ^M Application is terminating: True^M
* | Resolve merge commits, stage 1Tom2011-09-041-4/+13
|\ \ | |/
| * Fix bug in persisting saved appearances for npcsJustin Clark-Casey (justincc)2011-08-301-2/+7
| | | | | | | | | | Assets have to be marked non-local as well as non-temporary to persist. This is now done. Hopefully addresses http://opensimulator.org/mantis/view.php?id=5660
| * In the asset service, check that an asset exists before attempting to store it.Justin Clark-Casey (justincc)2011-08-171-4/+6
| |
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-091-3/+12
|\ \ | |/
| * When loading library asset set, only store an asset if it's different from ↵Justin Clark-Casey (justincc)2011-07-081-3/+12
| | | | | | | | | | | | | | | | | | an existing one with the same id. We compare existing and loaded asset by doing an SHA1 on both, so that a changed library asset will still update the store. This cuts asset library load time from 10 seconds to <1 sec. Note, a fix on the previous commit revealed a bug where a library script cannot be copied except on the first login after a cache clear. This is unrelated to this commit and needs to be fixed at some subsequent time.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-081-5/+51
|\ \ | |/
| * minor: slightly shorten "show digest" printing codeJustin Clark-Casey (justincc)2011-05-061-5/+5
| |
| * on asset "show digest" command, print out the asset type name (e.g. texture) ↵Justin Clark-Casey (justincc)2011-05-061-1/+1
| | | | | | | | as well as its number
| * Say which filename an asset has been dumped to on a successful dumpJustin Clark-Casey (justincc)2011-05-061-2/+6
| |
| * remove the NDesk.Options using since didn't end up needing itJustin Clark-Casey (justincc)2011-05-061-1/+0
| |
| * Add "dump asset" command to the asset service for debugging purposes.Justin Clark-Casey (justincc)2011-05-061-0/+43
| | | | | | | | This command dumps the asset with the given id to a file with the same name.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-171-0/+6
|\ \ | |/
| * Make all the objects in a coalescence reappears after being loaded from an ↵Justin Clark-Casey (justincc)2011-04-151-1/+9
| | | | | | | | | | | | | | IAR. This still doesn't work proprerly since some required textures/contained item assets might be missing. From pure code inspection, it looks like the uuid gatherer may get most asset uuids because the scene object serializer naively pulls non-root parts from all contained scene objects into one mega-object. However, root part uuids may well still be missing, and there may be other odd artifacts from this bug. It appears that storing the size of the coalescence and the offsets is redundant, since one can work out this information from the position data already in the scene object groups.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-161-1/+1
|\ \ | |/
| * TypoDiva Canto2011-02-121-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-33/+40
|\ \ | |/ | | | | Also prevent god takes from ending up in Lost and Found
| * WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵Diva Canto2010-11-251-33/+40
| | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs.
* | Return a UUID.Zero if the asset fails to uploadTom Grimshaw2010-06-281-1/+4
|/
* * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-091-0/+5
| | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found.
generated by cgit v1.1 at 2024-11-12 21:26:40 +0000