Melanie bf283208df Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-07-29 02:08:05 +01:00

..

HGMessageTransferModule.cs

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

InstantMessageModule.cs

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

MessageTransferModule.cs

Merge branch 'master' into careminster

2013-07-29 02:08:05 +01:00

MuteListModule.cs

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00

OfflineMessageModule.cs

Prevent an exception if no offline messages were retrieved.

2013-06-18 23:15:38 +01:00

PresenceModule.cs

Another 21 modules' directives moved out of .addin.xml

2012-11-13 08:27:51 -08:00