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
..
EnvironmentModule.cs	Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite	2012-05-23 17:04:19 -04:00
LightShareModule.cs	Introduce a LightShare kill packet ans send it when needed. Currently only	2011-12-28 09:24:02 +00:00