Melanie 13cd8c17d7 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs

2013-05-11 02:35:26 +01:00

..

Properties

Deleted all AssemblyFileVersion directives

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

Resources

Send up the part missing from the Avination Estate commit.

2013-05-11 01:27:37 +01: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

These files are part of the GridUserService write-up.

2010-05-07 21:32:02 -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-02-10 00:17:14 +00:00

SQLiteUserAccountData.cs

Merge branch 'master' into careminster

2012-11-15 00:43:26 +00: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