aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-21245-4893/+5999
|\
| * Cleaned up MySql migrations a bit more, got rid of all old-form migration fil...Diva Canto2010-05-205-32/+8
| * Removed sessionID from GridUserservice again. Removed parcel crossing detecti...Diva Canto2010-05-209-21/+18
| * Merging slimupdates2unknown2010-05-2032-889/+1093
| |\
| | * * Don't send texture data for prims in ImprovedTerseObjectUpdate packets unle...unknown2010-05-201-1/+5
| | * * Added sessionID to IGridUserService.SetLastPosition(), as some connectors w...unknown2010-05-209-132/+189
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-154-50/+8
| | |\
| | * | Refactor scene presence list for lockless iteration. Lock contention will now...Dan Lake2010-05-151-61/+53
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-131-8/+8
| | |\ \
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin joins...OpenSim Master2010-05-138-0/+144
| | * | | Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is w...unknown2010-05-121-5/+4
| | * | | * Initial commit of the slimupdates2 rewrite. This pass maintains the origina...unknown2010-05-1214-696/+704
| * | | | Revert one of the previous patches' hunks. The new code looked better, butMelanie2010-05-201-3/+10
| * | | | Series of patches to include creator ID in assets.AlexRa2010-05-201-4/+35
| * | | | Scrambled asset type in BasicAssetTest.cs!AlexRa2010-05-191-9/+10
| * | | | MySQLAssetData.cs now supports asset_flags, CreatorIDAlexRa2010-05-191-5/+7
| * | | | MySQL: added CreatorID, moved asset_flag to migration scriptAlexRa2010-05-191-0/+8
| * | | | SQLite: CreatorID added (and asset_flags moved) to the migration scriptAlexRa2010-05-191-0/+24
| * | | | Added CreatorID to SQLite asset dataAlexRa2010-05-191-15/+27
| * | | | A bit of harmless refactoring in SQLiteAssetData.csAlexRa2010-05-191-10/+3
| * | | | Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case)AlexRa2010-05-191-0/+2
| * | | | Kind of fixed Melanie's "Exception(sql)" correctionAlexRa2010-05-191-2/+2
| * | | | Change appender to deal with line feeds more intelligently.Melanie2010-05-192-2/+5
| * | | | Clean up output a bitMelanie2010-05-193-9/+12
| * | | | Fix the migration message to say "Continuing" again. Remove line feed, whichMelanie2010-05-191-1/+1
| * | | | Remove the return that was inserted in the last merge to allowMelanie2010-05-191-1/+0
| * | | | Revert "Allow migration steps to fail again without bringing down the house"Melanie2010-05-191-1/+1
| * | | | Allow migration steps to fail again without bringing down the houseMelanie2010-05-191-1/+1
| * | | | Merge commit 'alex/mssql-estate-bugfix'Melanie2010-05-181-49/+41
| |\ \ \ \
| | * | | | Massive bugfix in MSSQLEstateData (now works!)AlexRa2010-05-181-49/+41
| * | | | | Make m_log in migrations private. Define new m_log in derived classMelanie2010-05-182-1/+3
| * | | | | Binary Guids are 16 chars long. Fix parser.Melanie2010-05-181-1/+1
| * | | | | Revert a revert? Am i mad? Don't answer that....!Melanie2010-05-181-0/+2
| * | | | | Merge commit 'alex/Migrations'Melanie2010-05-187-93/+114
| |\ \ \ \ \
| | * | | | | Some more corrections after MySQL connector updateAlexRa2010-05-192-2/+3
| | * | | | | All (?) MySQL stores fixed to use DBGuid.FromDB()AlexRa2010-05-195-92/+68
| | * | | | | Added DBGuids.cs (static func DBGuid.FromDB()AlexRa2010-05-191-0/+44
| * | | | | | Revert "Looks like the new files were never added to prebuild.xml"Melanie2010-05-181-2/+0
| |/ / / / /
| * | | | | Looks like the new files were never added to prebuild.xmlMelanie2010-05-181-0/+2
| * | | | | Merge commit 'alex/Migrations'Melanie2010-05-180-0/+0
| |\ \ \ \ \
| | * | | | | MS SQL migrations converted to the new formatAlexRa2010-05-1877-2008/+2273
| | * | | | | Migrations for SQLite converted to new formatAlexRa2010-05-1846-709/+828
| | * | | | | Converted MySQL migration history to the new formatAlexRa2010-05-1879-1008/+1228
| | * | | | | Added MySqlMigrations.cs (supports stored proc/funcs)AlexRa2010-05-181-0/+85
| | * | | | | Embedded MySql.Data.dll updated to 6.2.3.0.AlexRa2010-05-181-0/+0
| | * | | | | Migration.cs supports single-file migration history formatAlexRa2010-05-181-104/+233
| | |/ / / /
| * | | | | Merge branch 'Migrations'Melanie2010-05-18205-3829/+4647
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | MS SQL migrations converted to the new formatAlexRa2010-05-1677-2008/+2273
| | * | | | Migrations for SQLite converted to new formatAlexRa2010-05-1646-709/+828
| | * | | | Converted MySQL migration history to the new formatAlexRa2010-05-1679-1008/+1228