Files
opensim/OpenSim/Region/CoreModules/Avatar/AvatarFactory
Melanie 637e9a10db Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-10-04 20:16:23 +01:00
..