Melanie 3589acdab1 Merge branch 'master' into careminster ...

Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat

2013-11-23 19:13:22 +00:00

..

Properties

…

Resources

…

PGSQLAssetData.cs

Merge branch 'master' into careminster

2013-11-03 21:34:36 +00:00

PGSQLAuthenticationData.cs

…

PGSQLAvatarData.cs

…

PGSQLEstateData.cs

Corrected estateID to EstateID on getEstates function at PGSQLEstateData.cs

2013-10-16 21:58:22 -05:00

PGSQLFramework.cs

* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.

2013-10-16 21:20:11 -05:00

PGSQLFriendsData.cs

…

PGSQLGenericTableHandler.cs

…

PGSQLGridUserData.cs

…

PGSQLGroupsData.cs

…

PGSQLHGTravelData.cs

…

PGSQLInventoryData.cs

…

PGSQLManager.cs

* One More thing, add an appdomain data element to ensure that we don't duplicate the assembly resolving.

2013-10-16 21:20:11 -05:00

PGSQLMigration.cs

…

PGSQLOfflineIMData.cs

…

PGSQLPresenceData.cs

…

PGSQLRegionData.cs

…

PGSQLSimulationData.cs

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

PGSQLUserAccountData.cs

Merge branch 'master' into careminster

2013-11-03 21:34:36 +00:00

PGSQLUserProfilesData.cs

…

PGSQLXAssetData.cs

…

PGSQLXInventoryData.cs

…