Melanie db774d4292 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/EventManager.cs

2012-09-16 04:11:20 +01:00

..

Base

pasting in show uptime code

2012-09-06 06:13:07 -04:00

Handlers

Merge branch 'master' into careminster

2012-09-16 04:11:20 +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