Melanie 2f365ea80b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-09-07 13:54:19 +01:00

..

Base

Make number of inbound http requests handled available as a httpserver.<port>.IncomingHTTPRequestsProcessed stat

2013-06-18 23:07:18 +01:00

Handlers

Merge branch 'master' into careminster

2013-09-07 13:54:19 +01:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

ServerMain.cs

minor: log an error rather than info if a connector fails to load.

2013-03-15 22:08:11 +00:00