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

Stopped storing dynamic attributes in the PrimShape

2013-01-25 04:03:20 +00:00

MSSQLAssetData.cs

Provide the interface for StoreAsset to report success or failure

2010-06-28 04:02:33 -07:00

MSSQLAuthenticationData.cs

MSSQL Additions for Presence Refactor branch. Most functionality tested and works, some outstanding issues around login location and border crossings on y axis.

2010-02-24 15:50:44 +00:00

MSSQLAvatarData.cs

remove some mono compiler warnings

2011-03-31 22:20:12 +01:00

MSSQLEstateData.cs

Reattaching a region was failing if the estate name had not changed (issue 5035).

2011-09-16 18:50:25 +01:00

MSSQLFriendsData.cs

Updates to MSSQL store for 0.7.3 to include:

2012-03-06 00:27:49 +00:00

MSSQLGenericTableHandler.cs

Merge branch 'master' into careminster-presence-refactor

2011-06-09 02:05:04 +01:00

MSSQLGridUserData.cs

remove some mono compiler warnings

2011-03-31 22:20:12 +01:00

MSSQLInventoryData.cs

Updates to MSSQL store for 0.7.3 to include:

2012-03-06 00:27:49 +00:00

MSSQLManager.cs

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

MSSQLMigration.cs

minor: remove some mono compiler warnings

2011-08-18 01:16:58 +01:00

MSSQLPresenceData.cs

Merge branch 'master' into careminster

2012-12-09 21:27:32 +00:00

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

MSSQLSimulationData.cs

Merge branch 'master' into careminster

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

MSSQLUserAccountData.cs

Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge

2011-10-11 21:31:48 +01:00

MSSQLXInventoryData.cs

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00