aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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-031-1/+1
|\ \ | |/ |/| | | | | | | | | 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-291-1/+1
| | | | | | | | | | | | 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-042-3/+24
|\ \ | |/ | | | | | | | | 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-032-3/+9
| | | | | | | | | | | | 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-022-8/+15
| | | | | | | | | | | | 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-021-8/+9
| |
* | 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.
| * Add a forgotten parameterMelanie2012-01-241-1/+1
| |
* | Completely disable NPC being sensed as agents, the abuse potential is too greatMelanie2012-01-281-1/+6
| |
* | 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.
| * 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-231-4/+35
|\ \ | |/ | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| * Fix up some parameter namingMelanie2012-01-221-2/+2
| |
| * Finish connecting Telehub to databaseBlueWall2012-01-221-3/+19
| |
| * Hooking up new telehub data to the databaseBlueWall2012-01-221-0/+14
| |
* | Merge branch 'master' into careminsterMelanie2012-01-223-2/+95
|\ \ | |/ | | | | | | 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-224-87/+95
| | | | | | | | | | | | | | | | | | | | 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-212-1/+86
| | | | | | | | 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.
| * Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
| |
* | Spin off terrain save into a new thread and make it so that it uses the oldMelanie2011-12-131-29/+34
| | | | | | | | values for places where NaN are found.
* | Don't allow deletion of a terrain from the database unless we have one to ↵Melanie2011-12-051-7/+21
| | | | | | | | replace it with
* | Plug a security hole in the inventory serviceMelanie2011-10-311-1/+2
| |
* | 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 commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmergeMelanie2011-10-111-44/+79
|\ \ | |/
| * Reattaching a region was failing if the estate name had not changed (issue ↵Kevin Houlihan2011-09-161-44/+79
| | | | | | | | | | | | 5035). Using the RemoteAdmin API to close then recreate a region would fail if the estate name had not changed. If the estate name /was/ changed then the existing estate would be renamed rather than a new one being created. The problem really arose from a lack of distinction in the data storage layer between creating new estates and loading existing ones.
* | Bring us up to date.Tom2011-09-141-1/+0
|\ \ | |/
| * Save the default terrain texture UUIDs for a new region instead of leaving ↵Justin Clark-Casey (justincc)2011-09-091-1/+0
| | | | | | | | | | | | | | | | | | | | | | them as UUID.Zero. Leaving them at UUID.Zero meant that when a viewer 2 logged into a region that had been freshly created, it received UUID.Zero for these textures, and hence display the land as plain white. On a simulator restart, the problem would go away since when the database adapators loaded the new region settings, RegionSettings itself has code to use default textures instead of UUID.Zero. This commit resolves the problem by saving the default texture UUIDs instead of Zero. However, we currently have to do this in a roundabout way by resaving once the RegionSettings have been created by the database for the first time. This needless complexity should be addressed. This change will also have the effect of replacing any existing UUID.Zero terrain textures with the default ones. However, this shouldn't have any effect since the UUID.Zeros were already being replaced in memory with those same UUIDs.
* | Resolve merge commits, stage 1Tom2011-09-042-19/+7
|\ \ | |/
| * Remove code which was automatically deleting non-root prims from scene ↵Justin Clark-Casey (justincc)2011-09-011-17/+0
| | | | | | | | | | | | | | objects that had previous been attachments. Looks like this code was accidentally uncommented in e1b5c612 from feb 2010. Appears to resolve the rest of http://opensimulator.org/mantis/view.php?id=5664
| * In the asset service, check that an asset exists before attempting to store it.Justin Clark-Casey (justincc)2011-08-171-2/+7
| |
* | Allow removing users from search and avatar pickerMelanie2011-07-311-2/+2
| |
* | Don't store the default WL profile. This will prevent "valid" from beingMelanie2011-07-051-1/+1
| | | | | | | | set on the default profile and hopefully finally fix day and night
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-06-203-0/+37
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * \ 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-092-0/+21
| |\ \ | | |/
| | * 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.