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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs

2012-06-08 00:14:39 +01:00

..

Application

Merge branch 'master' into careminster

2012-06-08 00:14:39 +01:00

ClientStack

Merge branch 'master' into careminster

2012-06-07 23:33:40 +01:00

CoreModules

Merge branch 'master' into careminster

2012-06-08 00:14:39 +01:00

DataSnapshot

minor: resolve some mono compiler warnings

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

Framework

Merge branch 'master' into careminster

2012-06-08 00:14:39 +01:00

OptionalModules

Merge branch 'master' into careminster

2012-06-06 13:07:05 +01:00

Physics

Merge branch 'avination' into careminster

2012-06-06 14:16:19 +01:00

RegionCombinerModule

minor: Add user feedback when executing fix-phantoms

2012-06-05 01:37:40 +01:00

ReplaceableModules

…

ScriptEngine

Merge branch 'avination' into careminster

2012-06-07 23:34:22 +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