aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-07-171-0/+10
|\
* \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-06-0759-182/+6070
|\ \ | |/
| * Fix bug where prim items were not loaded in the new sqlite database handlerJustin Clark-Casey (justincc)2010-06-041-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-fixesJustin Clark-Casey (justincc)2010-06-0459-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 linesJustin Clark-Casey (justincc)2010-04-301-6/+0
| | |
| | * fix an issue with user appearance where the new sqlite db adapter expects ↵Justin Clark-Casey (justincc)2010-04-308-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-3016-774/+24
| | | | | | | | | | | | db from master to 0.6.9
| | * take out some debug logging in the sqlite db adaptorJustin Clark-Casey (justincc)2010-04-301-3/+3
| | |
| | * rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least ↵Justin Clark-Casey (justincc)2010-04-3069-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 SQLiteNGJustin Clark-Casey (justincc)2010-04-301-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-301-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 confusionJustin Clark-Casey2010-04-3012-12/+12
| | |
| | * minor: correct the assembly information for SQLiteNGJustin Clark-Casey (justincc)2010-04-301-2/+2
| | |
| | * Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dllJustin Clark-Casey (justincc)2010-04-3016-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-3061-0/+6341
| | | | | | | | | | | | shortly be changed to work under mono 2.6 and above
* | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-05-312-4/+17
|\ \ \ | |/ /
| * | Apply http://opensimulator.org/mantis/view.php?id=4724Justin Clark-Casey (justincc)2010-05-212-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 careminsterMelanie2010-03-063-8/+1
|\ \ | |/
| * Fix a few compiler warnings.Jeff Ames2010-03-012-7/+0
| |
| * Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily ↵Justin Clark-Casey (justincc)2010-02-161-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 careminsterMelanie2010-02-142-17/+101
|\ \ | |/
| * * SQLite match code casing with regionsettings table field casing (what's ↵Teravus Ovares (Dan Olivares)2010-02-131-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-131-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=4224Justin Clark-Casey (justincc)2010-02-121-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 issueMelanie2010-02-081-79/+86
| |
* | Merge branch 'master' into careminsterMelanie2010-02-0815-2625/+2226
|\ \ | |/
| * Updated MySQL connection management to use the MySQL connection pooling. ↵Master ScienceSim2010-02-0515-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 insertUserRowOpenSim Master2010-02-051-1/+1
| |
| * * Fixed the Cable Beach inventory server to save the CreatorID as well as ↵OpenSim Master2010-02-051-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 careminsterMelanie2010-02-043-6/+3
|\ \ | |/
| * minor: remove some mono compiler warningsJustin Clark-Casey (justincc)2010-02-033-6/+3
| |
* | Merge branch 'master' into careminsterMelanie2010-01-093-0/+492
|\ \ | |/
| * Add the port of the XInventoryService for the new Sqlite frameworkMelanie2010-01-051-0/+156
| |
| * Sqlite framework and generic handler. They compile. More I cannot say.Melanie2010-01-042-0/+336
| |
| * Finish conversion if XInventoryServiceMelanie2010-01-042-7/+52
| |
| * First stage port of the XInventoryServiceMelanie2010-01-043-0/+200
| |
* | Finish conversion if XInventoryServiceMelanie2010-01-042-7/+52
| |
* | First stage port of the XInventoryServiceMelanie2010-01-043-0/+200
| |
* | Merge branch 'master' into careminsterMelanie2010-01-032-4/+5
|\ \ | |/
| * Formatting cleanup. Add copyright headers.Jeff Ames2010-01-041-3/+3
| |
| * Prevent the creation of duplicate inventory folders in the case of a loginMelanie2010-01-011-1/+1
| | | | | | | | database issue. Now the login will instaead fail later.
| * Put PassCollision on the ignore list for testing, since we don't save thatMelanie2009-12-311-0/+1
| | | | | | | | yet.
| * Correct some issues with the last commitroot2009-12-261-1/+2
| |
* | Correct some issues with the last commitroot2009-12-271-1/+2
| |
* | Merge branch 'master' into careminsterMelanie2009-12-261-2/+3
|\ \ | |/
| * Close a SQL injection loophole in the new database driverMelanie2009-12-261-2/+3
| |
| * Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| |
* | Make the GenericTableHandler work as intendedroot2009-12-261-2/+8
| |
* | Merge branch 'master' into careminsterMelanie2009-12-261-0/+25
|\ \ | |/
| * Add a generic REPLACE INTO handler for put into the generic table handlerMelanie2009-12-261-0/+25
| |