Melanie 10f8c2ea9b Merge branch 'master' into presence-refactor ...

This merge was very conflicted. I think I got them all, but I can't be sure.
I had to merge to master or risk divergence to the point of unmergeability.

2010-01-16 00:05:08 +00:00

..

InstantMessageModule.cs

Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.

2009-12-28 01:24:15 +00:00

MessageTransferModule.cs

* Finished SimulationServiceConnector

2010-01-07 15:53:55 -08:00

MuteListModule.cs

This is somewhat major-like..... Change the intialization order of

2009-12-28 01:56:30 +00:00

OfflineMessageModule.cs

Merge branch 'master' into presence-refactor

2010-01-16 00:05:08 +00:00

PresenceModule.cs

Change FriendsModule, InstantMessageModule, MessageTransferModule, MuteListModule, OfflineMessageModule, PresenceModule, InventoryTransferModule and LureModule to new style. Reduce FriendsModule and PresenceModule to shells.

2009-12-28 01:24:15 +00:00