Melanie 884c0e7bb1 Merge branch 'master' into careminster ... Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs		2012-05-27 19:24:30 +01:00
..
AssetStore.migrations	* Changed CreatorIDs consistently to varchar(128)	2010-06-08 15:47:14 -07:00
AuthStore.migrations	Converted MySQL migration history to the new format	2010-05-16 17:04:13 +03:00
Avatar.migrations	Fix logins and avatar appearance. Contains a Migration. May contain nuts.	2010-10-30 19:06:47 +01:00
EstateStore.migrations	Move Telehub tables and data from EstateSettings to RegionSettings.	2012-01-22 11:36:04 +00:00
FriendsStore.migrations	Switched order of SQL statements in Friends migration -- resulted in the wrong key	2011-06-11 09:36:57 -07:00
GridStore.migrations	Add the needed column in the regions table and a few tweaks.	2012-01-30 20:34:32 +00:00
GridUserStore.migrations	Cleaned up MySql migrations a bit more, got rid of all old-form migration files. Restored Presence table to its taboo-breaking form.	2010-05-20 20:24:50 -07:00
InventoryStore.migrations	Added creator info across the board -- TaskInventoryItems and InventoryItems themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being.	2010-11-21 17:19:24 -08:00
LogStore.migrations	Converted MySQL migration history to the new format	2010-05-16 17:04:13 +03:00
Presence.migrations	Bump migration version on LastSeen field so it is actually run	2010-10-18 19:08:26 +01:00
RegionStore.migrations	Merge branch 'master' into careminster	2012-05-27 19:24:30 +01:00
UserAccount.migrations	Converted MySQL migration history to the new format	2010-05-16 17:04:13 +03:00
UserStore.migrations	Converted MySQL migration history to the new format	2010-05-16 17:04:13 +03:00
XAssetStore.migrations	Switch to sha256 from sha1 in order to avoid future asset hash collisions.	2012-03-06 00:14:21 +00:00