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

Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs

2014-01-28 21:02:20 +00:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

2013-10-04 23:33:47 +01:00

Resources

Merge branch 'master' into careminster

2014-01-28 21:02:20 +00:00

MySQLAssetData.cs

Merge branch 'master' into careminster

2013-04-10 13:20:55 +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

…

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

2013-02-22 01:28:54 +00:00

MySQLGridUserData.cs

Fix SQL statement

2013-07-02 16:10:09 -07:00

MySQLGroupsData.cs

This makes group search work (Groups V2).

2013-07-28 09:00:28 -07:00

MySQLHGTravelData.cs

Cleanup old hg sessions (older than 2 days)

2013-07-14 15:47:54 -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

…

MySQLOfflineIMData.cs

Fix wrong sql statement in offline im.

2013-04-28 09:03:09 -07:00

MySQLPresenceData.cs

Restrict IPresenceData.VerifyAgent

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

MySQLRegionData.cs

Allow one to specify a DefaultHGRegion flag in [GridService] in order to allow different default regions for HG and direct grid logins.

2013-09-02 17:27:45 +01:00

MySQLSimulationData.cs

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

MySQLUserAccountData.cs

Merge branch 'master' into careminster

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

MySQLUserProfilesData.cs

Remove the core module extra profile settings support carried in with the latest

2014-01-05 21:16:30 +00:00

MySQLXAssetData.cs

Merge branch 'master' into careminster

2013-06-30 18:27:30 +01: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