Commit Graph

826 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
8eb70f9719 Fix bug where prim items were not loaded in the new sqlite database handler
This addresses mantis http://opensimulator.org/mantis/view.php?id=4739
2010-06-04 18:02:30 +01:00
Justin Clark-Casey (justincc)
2f6d401db1 Merge remote branch 'origin/0.6.9' into 0.6.9-post-fixes
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
2010-06-04 18:00:48 +01:00
Justin Clark-Casey (justincc)
3bd2ec7b2e Apply http://opensimulator.org/mantis/view.php?id=4724
Tweak to update appearance calls
Fix for deleting inventory items from a folder.
Thanks StrawberryFride!
2010-05-21 22:40:15 +01:00
Justin Clark-Casey (justincc)
139f425f4c take out some more sqlite db console debug lines 2010-04-30 22:08:57 +01:00
Justin Clark-Casey (justincc)
8966ed9c82 fix an issue with user appearance where the new sqlite db adapter expects directly specification of byte[] type rather than base64 strings 2010-04-30 21:37:31 +01:00
Justin Clark-Casey (justincc)
0b8b302aa0 Fix a bunch of issues that crop up after the naive porting of the new sqlite db from master to 0.6.9 2010-04-30 20:05:57 +01:00
Justin Clark-Casey (justincc)
d8b604b550 take out some debug logging in the sqlite db adaptor 2010-04-30 19:29:24 +01:00
Justin Clark-Casey (justincc)
56fe4c24b8 rename SQLiteNG to SQLite and SQLite to SQLiteLegacy this seems the least 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.
2010-04-30 19:28:28 +01:00
Justin Clark-Casey (justincc)
705b675d28 get region prim saving working properly in SQLiteNG
it wasn't working because of debug work that I'd forgotton to take out
2010-04-30 19:05:51 +01:00
Justin Clark-Casey (justincc)
b46380e373 dispose of the DbCommand used to execute migrations after we've finished 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
2010-04-30 19:05:39 +01:00
Justin Clark-Casey
a90054aa16 put SQLiteNG classes in their own namespace to avoid confusion 2010-04-30 19:05:09 +01:00
Justin Clark-Casey (justincc)
362007e5d3 minor: correct the assembly information for SQLiteNG 2010-04-30 19:04:53 +01:00
Justin Clark-Casey (justincc)
7ce0ec874a Change SQLiteNG to work with mono 2.6 and above using the Mono.Data.Sqlite.dll
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
2010-04-30 19:04:32 +01:00
Justin Clark-Casey (justincc)
959cd60225 Duplicate OpenSim.Data.SQLite into OpenSim.Data.SQLiteNG. SQLiteNG will shortly be changed to work under mono 2.6 and above 2010-04-30 18:59:10 +01:00
Jeff Ames
780ee4f991 Fix a few compiler warnings. 2010-03-01 23:04:45 +09:00
Justin Clark-Casey (justincc)
4355bcc417 Disable Data.BasicRegioNTest.T016_RandomSogWithSceneParts() temporarily since it's making the tests fail but the cause is not obvious (wrapped up in layers of reflection) 2010-02-16 19:31:49 +00:00
Teravus Ovares (Dan Olivares)
45493171b0 * SQLite match code casing with regionsettings table field casing (what's 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.
2010-02-13 05:50:57 -05:00
Teravus Ovares (Dan Olivares)
fa6da2f6c6 * This is an attempt to resolve mantis 4437 by using SqliteAdapter type 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.
2010-02-13 05:09:15 -05:00
Justin Clark-Casey (justincc)
802a969267 Fix http://opensimulator.org/mantis/view.php?id=4224
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.
2010-02-12 21:32:03 +00:00
Master ScienceSim
e1b5c61247 Updated MySQL connection management to use the MySQL connection pooling. This should accommodate various timeout problems that exist with the current connection pool code in a more general and standard way. 2010-02-05 18:07:59 -08:00
OpenSim Master
5f1f5c29e9 Fixing an incorrect logging message in insertUserRow 2010-02-05 18:06:01 -08:00
OpenSim Master
3e697ad57e * Fixed the Cable Beach inventory server to save the CreatorID as well as properly handling null item names and descriptions * Fixed the MySQL reader to safely handle null values in string columns that can be null 2010-02-05 18:05:57 -08:00
Justin Clark-Casey (justincc)
b9c3846e81 minor: remove some mono compiler warnings 2010-02-03 22:19:28 +00:00
Melanie
28ba16ee53 Add the port of the XInventoryService for the new Sqlite framework 2010-01-05 00:35:54 +00:00
Melanie
033a3da254 Sqlite framework and generic handler. They compile. More I cannot say. 2010-01-04 23:30:38 +00:00
Melanie
1ae9bfc074 Finish conversion if XInventoryService 2010-01-04 20:53:28 +00:00
Melanie
e76333555d First stage port of the XInventoryService 2010-01-04 20:53:26 +00:00
Jeff Ames
70d5b1c34c Formatting cleanup. Add copyright headers. 2010-01-04 06:17:30 +09:00
Melanie
0d9591bf35 Prevent the creation of duplicate inventory folders in the case of a login
database issue. Now the login will instaead fail later.
2010-01-01 22:51:00 +00:00
Melanie
61f63fdc38 Put PassCollision on the ignore list for testing, since we don't save that
yet.
2009-12-31 23:51:53 +00:00
root
b7951d5177 Correct some issues with the last commit 2009-12-26 23:57:49 +00:00
Melanie
0369256720 Close a SQL injection loophole in the new database driver 2009-12-26 23:38:11 +00:00
root
92be01d5e6 Make the GenericTableHandler work as intended 2009-12-26 01:50:21 +00:00
Melanie
9972b12812 Add a generic REPLACE INTO handler for put into the generic table handler 2009-12-26 00:19:54 +00:00
Adam Frisby
963cf25813 * Implements OSSL function: osGetSimulatorMemory - returns the current amount of memory allocated to the simulator process (Moderate Threat Level).
* Cleans redundant information out of the Simulator Version. Versions now look like:
"OpenSimulator 0.6.9(dev) Unix/Mono"
* [Minor] additional log info for MySQLInventoryData
2009-12-13 03:04:16 +11:00
Melanie
204c59c5ac Refix the fix 2009-12-11 02:42:05 +00:00
grid
d68b664243 Kill a NRE caused by an error message trying to print unavailable data 2009-12-11 02:42:00 +00:00
Kunnis
4c61fcfc40 Getting rid of the dead field RootInventoryFolderId on UserProfileData, It's not even stored in mysql.
Signed-off-by: Melanie <melanie@t-data.com>
2009-12-06 03:57:15 +00:00
Justin Clark-Casey (justincc)
c58d30616b Log old position and region information when an orphaned child prim is found 2009-12-02 18:54:24 +00:00
Justin Clark-Casey (justincc)
0f745e928f Apply patch that fixes the failing T013_eStateSettingsRandomStorage test
See http://opensimulator.org/mantis/view.php?id=3993
Thanks Kunnis
2009-11-27 18:52:20 +00:00
Adam Frisby
b516fe67a0 * Implements SQL Rollback support to Inventory Service for quicker backup restoration.
* Can optionally replace the OpenGridMode committed earlier.
* Will create a series of incrementing restore SQL files, one per user, in folders listed per-day.
* For MySql Section of InventoryService INI:
rollback = "true"
rollbackdir = "/absolute/path/to/rollback/storage/dir"
2009-11-23 17:20:03 +11:00
Adam Frisby
4973c057eb * Adds a modicum of additional checking to the Inventory Service (MySQL only)
* Enable "opengridmode=true" in your Inventory Connector (where the mysql connection strings are) to enable if you are running a 'wide-open-grid'.
* More comprehensive rollback support being implemented, should be available later today.
2009-11-23 16:08:06 +11:00
Jeff Ames
9f5c2acd12 Formatting cleanup. 2009-11-23 11:26:06 +09:00
Melanie
23438e66e7 Implement generic delete method 2009-11-18 08:53:07 +00:00
Melanie
06ecdf1967 Tweak presence handling and whip up a database connector and handler
for testign the new generic table handling
2009-11-18 08:21:28 +00:00
Melanie
0cd3bf074a Change PresenceData to PresenceInfo to remove a naming conflict in the
OpenSim.Data namespace
2009-11-18 06:19:39 +00:00
Melanie
9997790211 Committing the incomplete table handler to get it into the tree. No user
functionality yet
2009-11-15 20:19:19 +00:00
Justin Clark-Casey (justincc)
73b437b7b4 minor: remove some mono compiler warnings 2009-11-12 18:30:32 +00:00
John Hurliman
afef1ac191 Changing the AssetBase constructors to avoid initializing assets with an unknown asset type, and log an error if it ever does happen 2009-11-05 13:10:58 -08:00
John Hurliman
de71d23e14 Removing Console.WriteLine()s that were brought in with the revert 2009-11-02 11:54:39 -08:00