aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLXAssetData.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-201-14/+13
|\ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLXAssetData.cs
| * Fix configuration problems where XAssetDatabasePlugin was picked up ↵Justin Clark-Casey (justincc)2012-03-191-11/+11
| | | | | | | | | | | | | | | | | | 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-141-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().Robert Adams2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | .NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5 and before, WebUtil defined an extension method for Stream with the signature Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter is different in the two forms and depending on which compiler and/or runtime you use, you could get one form or the other. Crashes ensue. This change renames the WebUtil stream copy method to something that cannot be confused with the new CopyTo method defined in .NET 4.0.
* | Fix a merge artefactMelanie2012-03-091-4/+5
|/
* minor: move some compression related var setup inside compression if/then switchJustin Clark-Casey (justincc)2012-03-091-4/+3
|
* Put big fat EXPERIMENTAL warning in xassetservice database pluginJustin Clark-Casey (justincc)2012-03-091-0/+10
| | | | | This should not currently be used in any circumstances except for experimentation. Database tables used by this plugin can still change at any time with no migration path.
* Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-061-7/+15
| | | | | | | Some successful collision attacks have been carried out on sha1 with speculation that more are possible. http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future. Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
* remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
|
* Make asset compression optional. Currently set to false and not ↵Justin Clark-Casey (justincc)2012-03-031-16/+24
| | | | configurable from outside MySQLXAssetData.
* Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | | | | | Whether this is worthwhile is debatable since here we are not transmitting data over a network In addition, jpeg2000 (the biggest data hog) is already a compressed image format. May not remain.
* If asset data already exists with the required hash then don't rewrite itJustin Clark-Casey (justincc)2012-03-031-17/+59
|
* Perform asset storage transactionallyJustin Clark-Casey (justincc)2012-03-021-57/+69
|
* Make xassetservice execute one query to retrieve the asset, not twoJustin Clark-Casey (justincc)2012-03-021-28/+4
|
* Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-021-0/+416
This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.