aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/AssetBase.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add assettype mesh to list of binary assetsUbitUmarov2012-09-261-1/+2
|
* Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmergeMelanie2011-10-111-0/+1
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
| * Fix avatar parameter updating for viewer 3 and maybe 2.Justin Clark-Casey (justincc)2011-09-231-0/+1
| | | | | | | | | | | | | | | | | | When a slider parameter is changed, the viewer uploads a new shape (or other asset) and the item is updated to point to it. Viewer 1 uploaded the data in the initial request itself, so the asset references was almost always correctly updated. However, viewer 3/2 always uploads data in a subsequent xfer, which exposed a race condition where the viewer would make the item update before the asset had uploaded. This commit shuffles the order of operations to avoid this race, the item is updated with the new asset id instead of the old one while the upload was still taking place. A second race had to be fixed where avatar appearance would also be updated with the old asset id rather than the new one. This was fixed by updating the avatar appearance ids when the appearance was actually saved, rather than when the wearables update was made.
* | Merge branch 'master' into careminster-presence-refactorroot2011-07-051-0/+1
|\ \ | |/
| * Add basic flotsam asset cache test for retrieved cached asset.Justin Clark-Casey (justincc)2011-07-041-0/+1
| | | | | | | | Disabled temporarily since file system caching disrupts subsequent test runs
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+6
|\ \ | |/
| * HG Friends working to some extent: friendships offered and accepted ↵Diva Canto2011-05-191-0/+6
| | | | | | | | correctly handled. Friends list showing correct foreign names. TODO: GrantRights.
* | The other half of the asset fix. Implement an exponentially incrementing ↵Tom Grimshaw2010-06-291-0/+8
|/ | | | retry timer for asset upload failures. Total queue time in the ballpark of 24 hours, which should be a reasonable time for any grid admin to get their asset service back online. This should stop lost assets.
* * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-091-4/+4
| | | | | | 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.
* Add a field asset_flags and a corresponding enum to the asset database. ThisMelanie2010-05-091-0/+22
| | | | | | | CHANGES THE ASSET SERVER PROTOCOL and means you CAN NOT MIX PRIOR VERSIONS WITH LATER ONES. It may also eat your babies, yada, yada, yada. The usual cautions for migrations to the assets table apply. Coding: Can not guarantee nut free.
* Changed asset CreatorID to a stringJohn Hurliman2010-02-221-4/+7
|
* * Adds CreatorID to asset metadata. This is just the plumbing to support ↵John Hurliman2010-02-221-16/+8
| | | | CreatorID, it doesn't modify database backends or OAR files to support storing/loading it
* * Added a sanity check for missing asset data in LLClientViewJohn Hurliman2010-02-201-2/+15
| | | | | * Moved the SL asset type to content type conversion methods from ServerUtils to OpenSim.Framework.SLUtil * Linked content type to asset type in AssetMetadata
* Reintroduce AssetBase's old behavior. A Parameterless constructor is requiredMelanie2009-11-061-0/+10
| | | | | for .NET serialization and removing it breaks the OpenSim asset server protocol.
* Changing the AssetBase constructors to avoid initializing assets with an ↵John Hurliman2009-11-051-7/+35
| | | | unknown asset type, and log an error if it ever does happen
* minor:commentsTeravus Ovares (Dan Olivares)2009-08-121-1/+28
|
* Make AssetMetadata [Serializable] to help in binary cachingMelanie Thielker2009-06-031-0/+1
|
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* Cleaning up a few HG things. HG Posts may now work in grids, but if the home ↵diva2009-05-221-3/+17
| | | | grid is a standalone, this still doesn't work -- something wrong with RegionAssetService's DB connection.
* * Resolve bug where save oar would never complete if any assets were missingJustin Clarke Casey2009-05-151-0/+5
|
* * Added some more experimental code; nothing wired in so far.lbsa712009-04-091-3/+28
|
* * butterfingerslbsa712009-04-081-6/+6
|
* * Introduced some experimental code with regards to asset data substitutionlbsa712009-04-081-0/+22
|
* Mark AssetBase.Metadata with [XmlIgnore]Mike Mazur2009-03-131-9/+5
|
* - remove the Metadata property from AssetBase and return all previousMike Mazur2009-02-171-53/+91
| | | | | | | | | properties as before - prefix private variables with m_ in AssetBase.cs - related to Mantis #3122, as mentioned in https://lists.berlios.de/pipermail/opensim-dev/2009-February/005088.html - all services will likely need to be upgraded after this commit
* * optimized usings.lbsa712009-02-121-2/+0
|
* * Apply http://opensimulator.org/mantis/view.php?id=3080Justin Clarke Casey2009-02-091-0/+9
| | | | | | | * Changes the NHibernate asset mapping and expose FullID on AssetBase for NHibernate * mikem has seen this patch :)
* - add OpenSim.Framework.AssetMetadata class. AssetBase is now composed of itMike Mazur2009-02-041-22/+73
| | | | | - trim trailing whitespace
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-5/+5
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* mini-warnings-safari, plus cleanup of IUserServices method naming.Dr Scofield2008-07-041-1/+0
|
* * Drop InvType from the assets table since it is no longer usedJustin Clarke Casey2008-07-021-9/+0
| | | | | | | | * Migration should be automatic on sqlite and mysql * Migration is not automatic on mssql, you will need to drop the invType column manually * Migration should be fine, but as for any db change, I would recommend making sure you have backups before moving past this revision
* * minor: Remove crusty old unused agent inventory classesJustin Clarke Casey2008-06-231-0/+3
|
* * Remove all use of asset.InvType, as outlined in mailing list discussionJustin Clarke Casey2008-06-231-1/+1
| | | | | | * This is stage 1, the field will be removed from AssetType and the assets table if this change doesn't prove problematic
* * Spring cleaning.Adam Frisby2008-04-291-14/+23
| | | | | * Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
* make AssetBase use Properties instead of fields. This probably Sean Dague2008-04-041-8/+53
| | | | | | | breaks compatibility on grid ops because native serialization is used here.
* Formatting cleanup.Jeff Ames2008-03-181-27/+27
|
* * Mother of all commits:Adam Frisby2008-01-151-2/+2
| | | | | | | * Cleaned up copyright notices in AssemblyInfo.cs's * Added Copyright headers to a bunch of files missing them * Replaced several common string instances with a static constant to prevent reallocation of the same strings thousands of times. "" -> String.Empty is the first such candidate.
* * Optimized usingslbsa712007-12-271-1/+1
| | | | | | | * shortened references * Removed redundant 'this' * Normalized EOF
* saved OpenSim source code from the giant rampaging unterminated copyright ↵Jeff Ames2007-12-101-2/+2
| | | | notice of doom
* * Moved OpenSim/Framework/General to OpenSim/Framework for great justice.lbsa712007-10-311-0/+55