Melanie 36d744e2a5 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs		2012-07-19 09:47:51 +01:00
..
ScriptInstance.cs	Merge branch 'master' into careminster	2012-07-19 09:47:51 +01:00
ScriptSerializer.cs	Revert "Fix script "Running" behavior"	2012-07-16 23:31:55 +01:00