Melanie 001ec0e2e6 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-09-27 17:29:44 +01:00

..

Linden

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +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