Melanie e79fab91db Intermediate commit. Sill errors. ...

Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs

2014-01-05 20:12:32 +00:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Resources

Revert "Add support for user preferences (im via email)"

2013-12-07 01:29:15 +00:00

SQLiteAssetData.cs

Merge branch 'master' into careminster

2013-02-28 21:20:07 +00:00

SQLiteAuthenticationData.cs

More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.

2012-11-14 04:45:59 +00:00

SQLiteAvatarData.cs

More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.

2012-11-14 04:45:59 +00:00

SQLiteEstateData.cs

More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.

2012-11-14 04:45:59 +00:00

SQLiteFramework.cs

More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.

2012-11-14 04:45:59 +00:00

SQLiteFriendsData.cs

More consistently dispose of SqliteCommand in OpenSim.Data.SQLite where possible.

2012-11-14 04:45:59 +00:00

SQLiteGenericTableHandler.cs

Implement folder version updating for the sqlite inventory plugin

2012-11-15 03:29:55 +00:00

SQLiteGridUserData.cs

Fix SQL statement

2013-07-02 16:10:09 -07:00

SQLiteHGTravelData.cs

Added SQLite version of hg travel data store. UNTESTED. Hope it works!

2013-07-14 16:03:46 -07:00

SQLiteInventoryStore.cs

Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.

2012-02-21 02:52:20 +00:00

SQLiteSimulationData.cs

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

SQLiteUserAccountData.cs

Merge branch 'master' into careminster

2012-11-15 00:43:26 +00:00

SQLiteUserProfilesData.cs

Populate user preferences with UserAccount email if it is present, else return an error indicating no email is on record for the user.

2013-12-16 17:36:04 -05:00

SQLiteUtils.cs

* Add CSharpSqlite to prebuild

2010-09-23 01:21:08 -04:00

SQLiteXInventoryData.cs

refactor: move common inventory folder version update code to parent class in mysql, mssql and sqlite database plugins

2012-11-15 04:01:30 +00:00