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

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs

2012-09-16 04:11:20 +01:00

..

Linden

Merge branch 'avination' into careminster

2012-09-10 13:53:00 +01:00

ClientStackManager.cs

Formatting cleanup.

2009-10-01 01:17:47 +09:00

IClientNetworkServer.cs

Beginning work on the new LLUDP implementation

2009-10-05 17:38:14 -07:00

RegionApplicationBase.cs

Added unit tests for multi-region OARs

2012-09-14 20:32:25 +01:00