Melanie 6930d696e9 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs

2012-07-25 18:19:12 +01:00

..

Linden

Merge branch 'master' into careminster

2012-07-25 18:19:12 +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

Add main instance to internal MainServer.m_Servers list to simplify internal logic.

2012-06-15 02:03:50 +01:00