Files
opensim/OpenSim/Region/CoreModules/Avatar/AvatarFactory
Melanie 3f42183797 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
..