Melanie
f3132c45d9
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
..
2012-03-31 02:18:02 +01:00
2012-03-20 12:24:42 +01:00
2012-03-31 02:18:02 +01:00
2009-06-01 06:37:14 +00:00
2010-07-14 14:47:01 -07:00
2012-03-03 09:58:57 +00:00
2012-03-31 01:45:37 +01:00
2010-06-28 04:02:33 -07:00
2010-09-12 13:43:49 -04:00
2010-09-13 16:17:38 +01:00
2009-09-04 07:48:09 +01:00
2010-01-04 02:52:43 +00:00
2011-05-22 16:51:03 -07:00
2010-05-07 21:29:56 -07:00
2010-09-10 12:04:12 -07:00
2009-06-01 06:37:14 +00:00
2010-05-07 21:29:56 -07:00
2011-11-19 01:16:07 +00:00
2010-11-25 20:34:55 +01:00
2012-03-19 00:18:04 +00:00
2011-05-19 00:51:14 +01:00
2010-10-04 21:28:17 -04:00