Melanie 71dd55a1ce Merge branch 'master' into careminster ...

Conflicts:
	CONTRIBUTORS.txt
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

2012-09-29 19:21:07 +01:00

..

Properties

Minor: Change OpenSim to OpenSimulator in older copyright headers and LICENSE.txt.

2009-06-01 06:37:14 +00:00

Resources

Merge branch 'master' into careminster

2012-09-29 19:21:07 +01: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-04-24 21:30:12 +01: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

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

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

MySQLSimulationData.cs

Merge branch 'master' into careminster

2012-08-31 01:32:18 +01: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

Allow item links to be deleted even when other deletes and purges are disabled.

2011-05-19 00:51:14 +01:00