Melanie 69054ad134 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs

2013-10-06 18:32:20 +01:00

..

Properties

Bump OPenSimulator version and assembly versions up to 0.8.0 Dev

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

Resources

Preserve attachment point & position when attachment is rezzed in world

2013-09-22 21:10:01 -05:00

MSSQLAssetData.cs

Merge branch 'master' into careminster

2013-02-28 21:20:07 +00: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

Merge branch 'master' into careminster

2013-07-04 22:32:58 +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

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

MSSQLSimulationData.cs

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01: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