Files
opensim/OpenSim/Region/CoreModules/Avatar
Melanie 4ce42762ee Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
..
2011-11-04 01:18:37 +00:00
2011-01-18 01:48:37 +00:00
2011-12-05 21:26:43 +01:00
2012-01-17 17:36:26 +01:00
2012-01-03 11:10:23 -05:00