Melanie 96539ffc79 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2011-12-08 18:29:19 +00:00

..

Linden

Merge branch 'master' into bigmerge

2011-12-08 18:29:19 +00: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

Adding ssl support

2011-05-05 19:56:54 -04:00