Dan Lake 1091001cf6 Merge branch 'master' into dev ... Conflicts: OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs		2011-07-25 16:08:00 -07:00
..
Linden	Merge branch 'master' into dev	2011-07-25 16:08:00 -07: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