Melanie baaf660511 Merge branch 'master' into presence-refactor ...

This was a large, heavily conflicted merge and things MAY have got broken.
Please check!

2010-02-08 15:53:38 +00:00

..

Interfaces

Revert "Remove an insterface member that was never used"

2009-12-22 15:45:56 +00:00

Shared

Merge branch 'master' into presence-refactor

2010-02-08 15:53:38 +00:00

XEngine

Apply http://opensimulator.org/mantis/view.php?id=3334

2010-01-29 23:12:08 +00:00