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

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneGraph.cs

2012-01-25 15:24:25 +00:00

..

Application

Merge branch 'master' into careminster

2012-01-25 00:45:57 +00:00

ClientStack

Merge branch 'master' into careminster

2012-01-25 00:45:57 +00:00

CoreModules

Merge branch 'master' into careminster

2012-01-25 15:24:25 +00:00

DataSnapshot

Commenting out DataSnapShot message "Registering service discovery capability" for now.

2012-01-05 17:10:38 +00:00

Framework

Merge branch 'master' into careminster

2012-01-25 15:24:25 +00:00

OptionalModules

Merge branch 'master' into careminster

2012-01-25 00:45:57 +00:00

Physics

Merge branch 'master' into careminster

2012-01-25 00:45:57 +00:00

RegionCombinerModule

Merge branch 'master' into careminster

2011-12-18 10:49:45 +00:00

ReplaceableModules

…

ScriptEngine

Fix llLookAt the right way

2012-01-23 13:48:16 +01:00

UserStatistics

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00