Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-07-17 | 1 | -0/+10 |
|\ | |||||
* \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-06-07 | 59 | -182/+6070 |
|\ \ | |/ | |||||
| * | Fix bug where prim items were not loaded in the new sqlite database handler | Justin Clark-Casey (justincc) | 2010-06-04 | 1 | -27/+39 |
| | | | | | | | | This addresses mantis http://opensimulator.org/mantis/view.php?id=4739 | ||||
| * | Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes | Justin Clark-Casey (justincc) | 2010-06-04 | 59 | -163/+6039 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | This chiefly brings in the new sqlite adaptor and renames the old one to SQLiteLegacy Existing configuratios should continue to work without changes unless you are using Mac OSX and mono 2.6 or later, in which case you will need to enable SQLiteLegacy instead. Please se the instructions in OpenSim.ini.example and the relevant config/include .ini files Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs | ||||
| | * | take out some more sqlite db console debug lines | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -6/+0 |
| | | | |||||
| | * | fix an issue with user appearance where the new sqlite db adapter expects ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 8 | -81/+25 |
| | | | | | | | | | | | | directly specification of byte[] type rather than base64 strings | ||||
| | * | Fix a bunch of issues that crop up after the naive porting of the new sqlite ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 16 | -774/+24 |
| | | | | | | | | | | | | db from master to 0.6.9 | ||||
| | * | take out some debug logging in the sqlite db adaptor | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -3/+3 |
| | | | |||||
| | * | rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 69 | -366/+902 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita. | ||||
| | * | get region prim saving working properly in SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -10/+13 |
| | | | | | | | | | | | | it wasn't working because of debug work that I'd forgotton to take out | ||||
| | * | dispose of the DbCommand used to execute migrations after we've finished ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | with it rather than within the loop disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway | ||||
| | * | put SQLiteNG classes in their own namespace to avoid confusion | Justin Clark-Casey | 2010-04-30 | 12 | -12/+12 |
| | | | |||||
| | * | minor: correct the assembly information for SQLiteNG | Justin Clark-Casey (justincc) | 2010-04-30 | 1 | -2/+2 |
| | | | |||||
| | * | Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll | Justin Clark-Casey (justincc) | 2010-04-30 | 16 | -429/+236 |
| | | | | | | | | | | | | | | | | | | Include the library so that Windows builds correctly It appears that Windows is okay with either SQLite or SQLiteNG Incorporate the latest fixes made by Diva to OpenSim.Data.SQLite | ||||
| | * | Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will ↵ | Justin Clark-Casey (justincc) | 2010-04-30 | 61 | -0/+6341 |
| | | | | | | | | | | | | shortly be changed to work under mono 2.6 and above | ||||
* | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-31 | 2 | -4/+17 |
|\ \ \ | |/ / | |||||
| * | | Apply http://opensimulator.org/mantis/view.php?id=4724 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -4/+17 |
| |/ | | | | | | | | | | | Tweak to update appearance calls Fix for deleting inventory items from a folder. Thanks StrawberryFride! | ||||
* | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 3 | -8/+1 |
|\ \ | |/ | |||||
| * | Fix a few compiler warnings. | Jeff Ames | 2010-03-01 | 2 | -7/+0 |
| | | |||||
| * | Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily ↵ | Justin Clark-Casey (justincc) | 2010-02-16 | 1 | -1/+1 |
| | | | | | | | | since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection) | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 2 | -17/+101 |
|\ \ | |/ | |||||
| * | * SQLite match code casing with regionsettings table field casing (what's ↵ | Teravus Ovares (Dan Olivares) | 2010-02-13 | 1 | -1/+1 |
| | | | | | | | | | | | | with the upper case S in Sandbox while the rest is lower case 0.o) * It's doubtful that this will have any effect on mantis http://opensimulator.org/mantis/view.php?id=4577 . Sqlite 3 is required, Sqlite 2 was reported. | ||||
| * | * This is an attempt to resolve mantis 4437 by using SqliteAdapter type ↵ | Teravus Ovares (Dan Olivares) | 2010-02-13 | 1 | -11/+100 |
| | | | | | | | | | | | | | | statements instead of blanket SQL statements. The hope is that this makes SQLite work on Linux/Mono again. Re: http://opensimulator.org/mantis/view.php?id=4437 * Added a 'Create Update Statement' method that takes two fields for a primary key * Added an Update and Delete command for parcels and land access list table rows. | ||||
| * | Fix http://opensimulator.org/mantis/view.php?id=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -5/+0 |
| | | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector. | ||||
* | | Resolve a merge issue | Melanie | 2010-02-08 | 1 | -79/+86 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 15 | -2625/+2226 |
|\ \ | |/ | |||||
| * | Updated MySQL connection management to use the MySQL connection pooling. ↵ | Master ScienceSim | 2010-02-05 | 15 | -2629/+2230 |
| | | | | | | | | This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way. | ||||
| * | Fixing an incorrect logging message in insertUserRow | OpenSim Master | 2010-02-05 | 1 | -1/+1 |
| | | |||||
| * | * Fixed the Cable Beach inventory server to save the CreatorID as well as ↵ | OpenSim Master | 2010-02-05 | 1 | -2/+2 |
| | | | | | | | | properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 3 | -6/+3 |
|\ \ | |/ | |||||
| * | minor: remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 3 | -6/+3 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-09 | 3 | -0/+492 |
|\ \ | |/ | |||||
| * | Add the port of the XInventoryService for the new Sqlite framework | Melanie | 2010-01-05 | 1 | -0/+156 |
| | | |||||
| * | Sqlite framework and generic handler. They compile. More I cannot say. | Melanie | 2010-01-04 | 2 | -0/+336 |
| | | |||||
| * | Finish conversion if XInventoryService | Melanie | 2010-01-04 | 2 | -7/+52 |
| | | |||||
| * | First stage port of the XInventoryService | Melanie | 2010-01-04 | 3 | -0/+200 |
| | | |||||
* | | Finish conversion if XInventoryService | Melanie | 2010-01-04 | 2 | -7/+52 |
| | | |||||
* | | First stage port of the XInventoryService | Melanie | 2010-01-04 | 3 | -0/+200 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2010-01-03 | 2 | -4/+5 |
|\ \ | |/ | |||||
| * | Formatting cleanup. Add copyright headers. | Jeff Ames | 2010-01-04 | 1 | -3/+3 |
| | | |||||
| * | Prevent the creation of duplicate inventory folders in the case of a login | Melanie | 2010-01-01 | 1 | -1/+1 |
| | | | | | | | | database issue. Now the login will instaead fail later. | ||||
| * | Put PassCollision on the ignore list for testing, since we don't save that | Melanie | 2009-12-31 | 1 | -0/+1 |
| | | | | | | | | yet. | ||||
| * | Correct some issues with the last commit | root | 2009-12-26 | 1 | -1/+2 |
| | | |||||
* | | Correct some issues with the last commit | root | 2009-12-27 | 1 | -1/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -2/+3 |
|\ \ | |/ | |||||
| * | Close a SQL injection loophole in the new database driver | Melanie | 2009-12-26 | 1 | -2/+3 |
| | | |||||
| * | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 |
| | | |||||
* | | Make the GenericTableHandler work as intended | root | 2009-12-26 | 1 | -2/+8 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2009-12-26 | 1 | -0/+25 |
|\ \ | |/ | |||||
| * | Add a generic REPLACE INTO handler for put into the generic table handler | Melanie | 2009-12-26 | 1 | -0/+25 |
| | |