aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | Merge branch 'master' into careminsterMelanie2012-03-092-0/+527
|\ \ | |/
| * Merge branch 'xassetservice'Justin Clark-Casey (justincc)2012-03-092-0/+527
| |\
| | * 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-062-9/+17
| | | | | | | | | | | | | | | | | | | | | 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-022-0/+443
| | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge branch 'master' into careminsterMelanie2012-03-064-7/+169
|\ \ \ | |/ /
| * | Updates to MSSQL store for 0.7.3 to include:Chris Hart2012-03-064-7/+169
| |/ | | | | | | | | | | * Telehub support * Bugfix to Friends lookups * Updates to Creator fields to store up to 255 characters for HG item creator storage
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-041-2/+23
|\ \ | | | | | | | | | careminster
| * | Move KeyframeMotion from SOG to SOP because we can't persist it anyMelanie2012-02-261-2/+23
| | | | | | | | | | | | other way because SOG doesn't technically exist in the DB
* | | Merge branch 'master' into careminsterMelanie2012-03-033-4/+4
|\ \ \ | |/ / |/| / | |/ | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Use correct casing of RegionSettings.Sandbox in the various database modules.Justin Clark-Casey (justincc)2012-02-293-4/+4
| | | | | | | | | | | | MySQL and MSSQL have it as Sandbox, sqlite as sandbox. In various different places in every plugin the wrong casing is used... Consistency, who needs it? Or one day sqlite can change to Sandbox.
* | Merge branch 'master' into careminsterMelanie2012-02-217-0/+20
|\ \ | |/ | | | | Conflicts:
| * Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-217-0/+20
| |
* | Merge branch 'master' into careminsterMelanie2012-02-182-1/+128
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
| * Parcel sales support to SQLiteBlueWall2012-02-172-1/+10
| |
| * Fillin missing SQLite support for TelehubsBlueWall2012-02-172-0/+118
| |
* | Merge branch 'master' into careminsterMelanie2012-02-153-306/+700
|\ \ | |/
| * Fix: Lightshare Module(Windlight)-Region settings are not applicable for ↵PixelTomsen2012-02-142-305/+692
| | | | | | | | database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
| * Fix: MSSQLDB Grid - unable to register region ↵PixelTomsen2012-02-141-1/+8
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5886
| * Revert "Add GridStore migration for MSSQL."Justin Clark-Casey (justincc)2012-02-141-8/+0
| | | | | | | | This reverts commit 0b17a66e683f7ffca3877c1601c4179684b62144.
| * Add GridStore migration for MSSQL.Justin Clark-Casey (justincc)2012-02-141-0/+8
| | | | | | | | This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
* | Merge branch 'master' into careminsterMelanie2012-02-101-1/+1
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
| * Fix: Unable to remove AV from friend list (sqldb-bug) ↵PixelTomsen2012-02-101-1/+1
| | | | | | | | http://opensimulator.org/mantis/view.php?id=3731
* | Merge branch 'master' into careminsterMelanie2012-02-046-8/+46
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * Add default value to TelehubObjectBlueWall2012-02-041-0/+10
| |
| * Fix: Covenant changed time not set ↵PixelTomsen2012-02-036-8/+31
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5869 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * Replace ParcelAccessEntry with a new struct, LandAccessEntry, which moreMelanie2012-02-024-20/+27
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | Make ban, eject, freeze and the scripted versions of those work.Melanie2012-02-023-20/+21
| |
* | Merge branch 'master' into careminsterMelanie2012-01-301-0/+9
|\ \ | |/
| * Add the needed column in the regions table and a few tweaks.Melanie2012-01-301-0/+9
| | | | | | | | | | Warning: Contains a Migration Warning: Cannot guarantee nut free
* | Merge branch 'master' into careminsterMelanie2012-01-302-2/+10
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-302-2/+10
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-281-1/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-01-261-6/+6
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * refactor: change RezScriptFromAgentInventory(), RezNewScript() and ↵Justin Clark-Casey (justincc)2012-01-261-6/+6
| | | | | | | | | | | | AddInventoryItem() to accept an agent id rather than a full IClientAPI. This stops some code having to make spurious client == null checks and reduces regression test complexity.
| * Add a forgotten parameterMelanie2012-01-241-1/+1
| |
* | Correct some SQL syntaxMelanie2012-01-241-1/+1
| |
* | Fix merge artefacts and build breakMelanie2012-01-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-242-51/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-241-40/+13
| | | | | | | | additional redundant information.
generated by cgit v1.1 at 2024-12-28 02:08:13 +0000