Melanie a7eb1b5b85 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-07-24 03:50:09 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Resources

Fix HGTravelStore.migrations in SQLite (mantis #6709)

2013-07-19 20:25:33 -07: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-06-30 18:27:30 +01:00

SQLiteUserAccountData.cs

Merge branch 'master' into careminster

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

SQLiteUserProfilesData.cs

SQLite support for UserProfiles

2013-06-07 20:14:39 -04: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