aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-21243-4893/+5995
|\
| * Cleaned up MySql migrations a bit more, got rid of all old-form migration ↵Diva Canto2010-05-205-32/+8
| | | | | | | | files. Restored Presence table to its taboo-breaking form.
| * Removed sessionID from GridUserservice again. Removed parcel crossing ↵Diva Canto2010-05-209-21/+18
| | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
| * Merging slimupdates2unknown2010-05-2032-889/+1093
| |\
| | * * Don't send texture data for prims in ImprovedTerseObjectUpdate packets ↵unknown2010-05-201-1/+5
| | | | | | | | | | | | unless we were asked to
| | * * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵unknown2010-05-209-132/+189
| | | | | | | | | | | | | | | | | | will want to track position against sessionID instead of userID * Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵unknown2010-05-153-50/+7
| | |\ | | | | | | | | | | | | slimupdates2
| | * | Refactor scene presence list for lockless iteration. Lock contention will ↵Dan Lake2010-05-151-61/+53
| | | | | | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵unknown2010-05-131-8/+8
| | |\ \ | | | | | | | | | | | | | | | slimupdates2
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin ↵OpenSim Master2010-05-138-0/+144
| | | | | | | | | | | | | | | | | | | | joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed.
| | * | | Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is ↵unknown2010-05-121-5/+4
| | | | | | | | | | | | | | | | | | | | working)
| | * | | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵unknown2010-05-1214-696/+704
| | | | | | | | | | | | | | | | | | | | original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
| * | | | Revert one of the previous patches' hunks. The new code looked better, butMelanie2010-05-201-3/+10
| | | | | | | | | | | | | | | | | | | | was less efficient.
| * | | | Series of patches to include creator ID in assets.AlexRa2010-05-201-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains a migration. SQLite: May contain nuts. The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db. BasicAssetTest checks CreatorID storage, new test for weird CreatorID (now also checks that non-GUID or empty CreatorID gets stored correctly) Signed-off-by: Melanie <melanie@t-data.com>
| * | | | Scrambled asset type in BasicAssetTest.cs!AlexRa2010-05-191-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The asset type wasn't in the list of "DontScramble" fields, so the test assets were stored with randomized type, which caused exception on reading them. Also the scrambler was moved from local var to the class level, so it could be used in the new tests I've added (see the next commit).
| * | | | 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
| | | | |
| * | | | Kind of fixed Melanie's "Exception(sql)" correctionAlexRa2010-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Throwing an Ex. with SQL command in the message looks weird, this is a bit better, but I'm still not sure if that's the proper way to handle. Also, there is a catch one level up, so is this one necessary?
| * | | | Change appender to deal with line feeds more intelligently.Melanie2010-05-192-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change migration error reporting to not truncate the statement when reporting. It's a bit messier than the old error reporting, but at least one gets an idea of what could be wrong again. And things look a lot neater now.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | prevented the full message from displaying.
| * | | | Remove the return that was inserted in the last merge to allowMelanie2010-05-191-1/+0
| | | | | | | | | | | | | | | | | | | | migrations to continue in the face of an error
| * | | | Revert "Allow migration steps to fail again without bringing down the house"Melanie2010-05-191-1/+1
| | | | | | | | | | | | | | | | | | | | This reverts commit 167db502593de5f535d8c322005c63ef263940ed.
| * | | | 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
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes some type conversion bugs and also makes the estate lists work properly for MSSQL. Strawberry, please check this. Signed-off-by: Melanie <melanie@t-data.com>
| | * | | | 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
| | | | | |
| * | | | | Some more corrections after MySQL connector updateAlexRa2010-05-192-2/+3
| | | | | |
| * | | | | All (?) MySQL stores fixed to use DBGuid.FromDB()AlexRa2010-05-195-92/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was needed if we want to update to the latest MySQL connector dll. It automatically converts CHAR(36) to Guids, so getting them as strings no longer works. By using DBGuid.FromDB(), we unlink from any particular storage format of GUIDs, could even make them BINARY(16) if we like. Actually not all MySql units are touched, but the remaining ones don't seem to be affected (they don't read GUIDs from DB)
| * | | | | Added DBGuids.cs (static func DBGuid.FromDB()AlexRa2010-05-191-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This DBMS-independent function to be used converting UUIDs from whatever format used in the DB (string/binary/Guid). This is mostly needed for MySQL, as in MSSQL they are always UNIQUEIDENTIFIERs and in SQLite always strings (but would look better if we use it there anyway).
| * | | | | Merge branch 'Migrations'Melanie2010-05-18204-3829/+4647
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This merges AlexRa's work on migration streamlining. This merge is experimental. If it causes issues, feel free to back out. Signed-off-by: Melanie <melanie@t-data.com>
| | * | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced all NNN_StoreName.sql migration resources with a more readable, single-file-per-store
| | * | | | Added MySqlMigrations.cs (supports stored proc/funcs)AlexRa2010-05-161-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses MySqlScript class to correctly run proc/func definitions that need delimiter change. Requires MySql.Data.dll 6.2 or later.
| | * | | | Migration.cs supports single-file migration history formatAlexRa2010-05-161-104/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scans for migration resources in either old-style "scattered" (one file per version) or new-style "integrated" format (single file "Resources/{StoreName}.migrations[.nnn]") with ":VERSION nnn" sections). In the new-style migrations it also recognizes ':GO' separators for parts of the SQL script that must be sent to the server separately. The old-style migrations are loaded each in one piece and don't support the ':GO' feature. Status: TESTED and works fine in all modes!
| * | | | | Allow remote admin to be used on a different port from the main region portMelanie Thielker2010-05-181-2/+3
| | | | | |
* | | | | | Refactor scene presence list for lockless iteration. Lock contention will ↵Melanie2010-05-211-82/+49
| | | | | | | | | | | | | | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene.
* | | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-212-22/+54
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-05-215-443/+542
| |\ \ \ \ \ \
| | * | | | | | back port groups changesunknown2010-05-052-1329/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * | | | | | back port groups changesunknown2010-05-055-443/+1798
| | | | | | | |
| | * | | | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵Melanie2010-05-054-1570/+320
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" The patch was for 0.7 This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb.
| | * | | | | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groupsMelanie2010-05-054-320/+1570
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mantis #4646 Signed-off-by: Melanie <melanie@t-data.com>
| | * | | | | | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| | | | | | | |
| | * | | | | | Fix some symbol errorsMelanie2010-04-301-2/+2
| | | | | | | |