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

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2013-02-05 21:30:12 +00:00

..

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Resources

Remove the accidental PrimShapes column that I added back to the SQLite region store

2013-01-25 04:35:06 +00:00

SQLiteAssetData.cs

Merge branch 'master' into careminster

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