Melanie 26d89777d8 Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-07-06 20:51:18 +01:00

..

Linden

Merge branch 'avination' into careminster

2012-07-06 20:51:18 +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