Melanie a9dad99432 Merge branch 'master' into careminster-presence-refactor ... Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs		2010-05-23 06:09:54 +01:00
..
Linden	Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522	2010-02-12 23:13:35 +00:00
MXP	Merge branch 'master' into careminster-presence-refactor	2010-05-23 06:09:54 +01:00
Sirikata	Merge branch 'master' into careminster-presence-refactor	2010-05-23 06:09:54 +01:00
VWoHTTP	Merge branch 'master' into careminster-presence-refactor	2010-05-23 06:09:54 +01:00