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

Merge branch 'master' into careminster

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

MySQLAssetData.cs

Merge branch 'master' into careminster

2012-04-30 19:04:38 +01:00

MySQLAuthenticationData.cs

Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.

2012-04-30 15:54:35 +01:00

MySQLAvatarData.cs

Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.

2012-04-30 15:54:35 +01:00

MySQLEstateData.cs

Move Telehub tables and data from EstateSettings to RegionSettings.

2012-01-22 11:36:04 +00:00

MySQLFramework.cs

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

MySQLFriendsData.cs

Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.

2012-04-30 15:54:35 +01:00

MySQLGenericTableHandler.cs

Merge branch 'master' into careminster

2012-11-08 04:51:00 +00:00

MySQLGridUserData.cs

GridUserService in place. Replaces the contrived concept of storing user's home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway.

2010-05-07 21:29:56 -07:00

MySQLInventoryData.cs

Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.

2012-04-30 15:54:35 +01:00

MySQLMigrations.cs

Revert "This is a HACK! Downright nasty. For some reason, the devs of the mysql"

2010-06-19 23:45:56 +01:00

MySQLPresenceData.cs

Restrict IPresenceData.VerifyAgent

2012-12-09 15:08:32 -05:00

MySQLRegionData.cs

Move OpenSim.Data.RegionFlags -> OpenSim.Framework.RegionFlags to make it easier for other code to use (e.g. LSL_Api) without having to reference OpenSim.Data just for this.

2012-10-09 01:35:27 +01:00

MySQLSimulationData.cs

Merge branch 'master' into careminster

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

MySQLUserAccountData.cs

Merge branch 'master' into careminster

2012-04-30 19:04:38 +01:00

MySQLXAssetData.cs

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00

MySQLXInventoryData.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