Dan Lake 7210b7f517 Merge branch 'master' of git://opensimulator.org/git/opensim into dev ... Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs		2011-03-07 15:57:31 -08:00
..
Clients	More cleaning on presence. Friends online/offline works again.	2010-05-08 07:44:07 -07:00
Common	Merge branch 'master' of git://opensimulator.org/git/opensim into dev	2011-03-07 15:57:31 -08:00
ConfigurationLoaderTest.cs	fix OpenSim.Tests.ConfigurationLoaderTest to satisfy requirement that OpenSimDefaults.ini is present	2010-09-14 17:01:53 +01:00