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

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs

2012-04-27 22:28:09 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00:00

Capabilities

Add regression test for teleporting an agent between separated regions on the same simulator.

2012-04-27 00:58:54 +01:00

ConsoleClient

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Data

Merge branch 'master' into careminster

2012-04-24 21:30:12 +01:00

Framework

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

Region

Merge branch 'master' into careminster

2012-04-27 22:28:09 +01:00

Server

Merge branch 'master' into careminster

2012-04-27 22:28:09 +01:00

Services

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2012-04-27 01:31:12 +01:00

Tests

Merge branch 'master' into careminster

2012-04-27 17:09:49 +01:00

Tools

minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"

2012-03-02 01:54:48 +00:00