Melanie 64393a7ca8 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs		2012-07-13 02:27:16 +01:00
..
Base	Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.	2012-07-11 22:54:22 +01:00
Handlers	Merge branch 'master' into careminster	2012-07-13 02:27:16 +01:00
ServerMain.cs	Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.	2012-06-15 02:51:52 +01:00