aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/Resources (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-05-271-0/+12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * Environment Module - allows Environment settings for Viewer3 warning: ↵PixelTomsen2012-05-231-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | includes database region store migrations for mssql, mysql, sqlite enable/disable this module: Cap_EnvironmentSettings = "localhost" (for enable) Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file) or owerwrite in OpenSim.ini mantis: http://opensimulator.org/mantis/view.php?id=5860 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | Merge branch 'master' into careminsterMelanie2012-03-091-0/+27
|\ \ | |/
| * Switch to sha256 from sha1 in order to avoid future asset hash collisions.Justin Clark-Casey (justincc)2012-03-061-2/+2
| | | | | | | | | | | | | | 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.
| * Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-021-0/+27
| | | | | | | | | | | | | | 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-02-041-0/+20
|\ \ | |/ | | | | | | | | 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-031-0/+5
| | | | | | | | | | | | 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-021-0/+6
| | | | | | | | | | | | accurately reflects the data sent by the viewer. Add times bans and the expiration of timed bans. Warning: Contains a Migration (and nuts)
* | 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-301-0/+6
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Add ParcelImageID to RegionSettings so we can have that overlay.Melanie2012-01-301-0/+6
| | | | | | | | | | Warning: Contains a Migration. Warning: May contain nuts.
* | Merge branch 'master' into careminsterMelanie2012-01-241-12/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since theMelanie2012-01-231-12/+3
| | | | | | | | | | | | Telehub commits! They will eat your babies and corrupt your database while they munch. DO NOT use anything from the first Telehub commit to this one. FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
* | Merge branch 'master' into careminsterMelanie2012-01-221-1/+25
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Change the key name I missed in last commitMelanie2012-01-221-1/+1
| |
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-22/+25
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-211-0/+21
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge commit 'aadf7dd91cdeb98b48cd81c5db06481593aff993' into bigmergeMelanie2011-10-111-23/+0
|\ \ | |/
| * Remove vestigal OpenSim.Data mono addins extension points that don't look ↵Justin Clark-Casey (justincc)2011-09-201-23/+0
| | | | | | | | like they've been active for at least 2 and a half years
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-131-1/+1
|\ \ | |/
| * Switched order of SQL statements in Friends migration -- resulted in the ↵Diva Canto2011-06-111-1/+1
| | | | | | | | wrong key
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-111-0/+16
|\ \ | |/
| * For MySQL, migrate region tables to the MyISAM storage engine rather than InnoDBJustin Clark-Casey (justincc)2011-06-101-0/+16
| | | | | | | | | | | | | | | | Using MyISAM proves vastly faster for persisting scene objects. For instance, a scene object that took 9 seconds to persist before now takes 1. This also improves the experience of loading large OARs. We don't use any of the transactional features of InnoDB. The only thing that may have an impact is that InnoDB does row locking on inserts while MyISAM does table locking. However, field reports say there is no noticeable difference.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-0/+7
|\ \ | |/
| * This is the better solution: make the combined key be only on the first 36 ↵Diva Canto2011-06-011-1/+2
| | | | | | | | characters of each field -- that's the UUIDs. Thanks coyled. WARNING: Again, people who have gone through this migration and failed need to run it manually.
| * It looks like there's a better solution for that problem.Diva Canto2011-06-011-2/+1
| | | | | | | | | | | | Revert "Changed Friends table to have 165-sized varchars on PrincipalID and FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually." This reverts commit 3fa54a156a83e498a7d5d0949a5f848fe82fe86f.
| * Changed Friends table to have 165-sized varchars on PrincipalID and ↵Diva Canto2011-06-011-1/+2
| | | | | | | | FriendID. The reason for this number is the following: there is a combined key of these 2 fields; apparently MySql can't handle keys larger than 1000 bytes; when the table is created with utf8 encoding, this combined key is bigger than 1000 bytes, and the migration fails. WARNING: this is not a new migration! People who have gone through this migration and failed should update the sizes of these fields manually.
| * 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.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-0/+7
|\ \ | |/
| * Fixed some inconsistency with trailing /. Made debug messages consistent. ↵Diva Canto2010-12-051-0/+7
| | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-222-0/+17
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-212-0/+9
| | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
| * Global creator information working on MySQL DB and on load/save OARs. ↵Diva Canto2010-11-211-0/+8
| | | | | | | | | | | | | | Creator name properly shown on the viewer as first.last @authority. New option added to save oar -profile=url. Migration on RegionStore making CreatorID be 255 chars. Moved Handling of user UUID -> name requests to a new module UserManagement/UserManagementModule.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-021-0/+8
|\ \ | |/
| * Fix logins and avatar appearance. Contains a Migration. May contain nuts.Melanie2010-10-301-0/+8
| | | | | | | | | | | | This will cause visual params to be persisted along with worn items. With this, alpha and tattoo laters will be saved. Multiple layers MAY work, but not tested because I don't use Viewer 2.
| * Bump migration version on LastSeen field so it is actually runMelanie2010-10-181-1/+1
| |
| * Ensure no UUID.Zero region ID is ever written to presence. Add a MigrationMelanie Thielker2010-10-131-0/+8
| | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-301-2/+12
|\ \ | |/
| * Implements parcel media setting persistence and packet / CAPS handlingJonathan Freedman2010-08-301-2/+12
| | | | | | | | | | | | properly for the new media settings. Signed-off-by: Melanie <melanie@t-data.com>
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-08-061-1/+8
|\ \ | |/
| * add mysql support for media on a primJustin Clark-Casey (justincc)2010-07-261-1/+8
| |
* | Bump the migration version, ot it would never happenMelanie Thielker2010-06-211-1/+1
| |
* | Ensure no UUID.Zero region ID is ever written to presence. Add a MigrationMelanie Thielker2010-06-211-0/+8
| | | | | | | | to add a LastSeen field of type "Timestamp" to Presence for MySQL
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-161-2/+0
|\ \ | |/
| * * Deleted duplicated migration that was failing anyway.Diva Canto2010-06-141-2/+0
| | | | | | | | * Added an error message in initial estate owner creation that makes it clear what needs to happen.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-06-092-1/+9
|\ \ | |/
| * Add the BEGIN; I had missedMelanie2010-06-091-0/+1
| |
| * Re-add Migration version 32, which apparently got dropped completely.Melanie2010-06-091-0/+72
| |