Melanie
75c68fa29e
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-10-04 20:03:12 +01:00
..
2011-10-14 23:32:15 +01:00
2013-06-30 18:27:30 +01:00
2013-09-18 23:49:27 +01:00
2013-08-24 03:40:44 -07:00
2011-09-23 21:57:52 +01:00
2013-10-04 20:03:12 +01:00
2013-10-04 20:03:12 +01:00
2009-12-23 17:31:30 -08:00
2012-09-18 23:57:00 +01:00
2013-04-10 13:20:55 +01:00
2013-02-06 02:40:32 +00:00
2011-04-27 23:57:26 +01:00
2013-08-20 21:09:17 -05:00
2013-08-20 21:09:17 -05:00
2012-01-03 20:22:15 +00:00
2011-04-27 23:57:26 +01:00
2010-09-23 00:50:18 -04:00
2011-04-27 23:57:26 +01:00
2010-09-23 00:50:18 -04:00
2011-04-27 23:57:26 +01:00
2013-04-23 15:01:20 -07:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00
2013-04-22 22:58:33 +02:00
2011-04-27 23:57:26 +01:00
2013-06-04 21:11:16 +01:00
2013-03-16 03:14:11 -04:00
2013-03-16 03:14:11 -04:00
2013-02-12 14:47:26 -08:00
2013-04-17 21:31:18 -07:00
2013-04-17 21:31:18 -07:00
2013-04-17 21:31:18 -07:00
2011-04-27 23:57:26 +01:00
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00
2012-12-13 00:05:34 -05:00
2011-04-27 23:57:26 +01:00
2012-02-25 03:25:56 +00:00
2011-04-27 23:57:26 +01:00
2011-05-17 22:38:45 +02:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00
2011-11-29 22:25:03 -05:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00
2012-02-25 03:25:56 +00:00
2012-12-08 17:15:35 -05:00
2012-12-08 17:15:35 -05:00
2013-05-16 00:07:55 +02:00
2013-04-17 21:31:18 -07:00
2013-05-16 00:07:55 +02:00
2013-05-16 00:07:55 +02:00
2013-05-16 00:07:55 +02:00
2013-05-16 00:07:55 +02:00
2013-05-16 00:07:55 +02:00
2013-05-16 00:07:55 +02:00
2013-08-06 18:29:33 +01:00
2009-08-10 08:14:57 -07:00
2009-08-17 09:21:39 +01:00
2009-09-03 20:00:18 +01:00
2013-08-06 18:29:33 +01:00
2013-10-04 20:03:12 +01:00
2009-05-18 21:14:08 +00:00
2013-10-04 20:03:12 +01:00
2010-09-13 16:23:22 -07:00
2012-09-18 23:45:06 +01:00
2013-08-23 20:58:46 +01:00
2012-11-14 02:44:10 +00:00
2012-05-07 00:08:56 -07:00
2010-07-03 10:40:33 -07:00
2013-08-06 18:29:33 +01:00
2013-08-06 18:29:33 +01:00
2013-09-05 00:41:03 +01:00
2013-09-05 00:41:03 +01:00
2013-04-22 22:23:42 +02:00
2012-03-19 00:29:02 +00:00
2012-03-19 00:29:02 +00:00
2012-06-20 01:06:55 +01:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00
2011-04-27 23:57:26 +01:00