Files
opensim/OpenSim/Region/CoreModules/Avatar
Melanie e903709847 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01: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