Files
opensim/OpenSim/Region/CoreModules/Avatar
Melanie c7e302864a Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +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