Melanie 1ebc9d04aa Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2012-01-05 08:15:33 +00:00

..

Linden

Merge branch 'master' into careminster

2012-01-05 08:15:33 +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