Melanie 81ce169dfe Merge branch 'avination' into careminster ...

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-05-15 21:24:27 +01:00

..

Application

Merge branch 'master' into careminster

2012-05-10 20:33:27 +01:00

ClientStack

Merge branch 'avination' into careminster

2012-05-13 01:25:03 +01:00

CoreModules

Merge branch 'master' into careminster

2012-05-14 23:32:49 +01:00

DataSnapshot

minor: resolve some mono compiler warnings

2012-05-03 01:56:24 +01:00

Framework

Merge branch 'avination' into careminster

2012-05-15 21:24:27 +01:00

OptionalModules

Merge branch 'avination' into careminster

2012-05-13 01:25:03 +01:00

Physics

Merge branch 'avination' into careminster

2012-05-15 21:24:27 +01:00

RegionCombinerModule

Merge branch 'master' into careminster

2012-03-11 02:29:43 +00:00

ReplaceableModules

…

ScriptEngine

Merge branch 'avination' into careminster

2012-05-15 21:24:27 +01:00

UserStatistics

Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.

2012-05-03 01:45:49 +01:00