Files
opensim/OpenSim/Region/CoreModules/ServiceConnectorsOut
Melanie dfafb5ca14 Merge branch 'master' into careminster
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-12 03:09:52 +01:00
..