Files
opensim/OpenSim/Region/OptionalModules/Agent/InternetRelayClientView
Melanie 96539ffc79 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
..