Melanie 9a23501824 Merge branch 'master' into careminster ...

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

2012-04-25 02:33:39 +01:00

..

JsonStore

clean up some more logging spam in the jsonstore modules

2012-04-17 14:23:43 -07:00

Minimodule

refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()

2012-04-25 02:07:55 +01:00

ObjectModules

Add copyright headers.

2009-03-07 02:11:50 +00:00

RegionReadyModule

RegionReady logging

2012-03-22 20:49:45 -04:00

ScriptModuleComms

make the namespace for the ScriptModuleComms consistent with its file system location

2012-04-17 13:45:03 -07:00

XmlRpcRouterModule

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00