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

Conflicts:
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
	OpenSim/Services/Interfaces/IUserAccountService.cs

2012-01-02 21:41:36 +00:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2011-12-19 21:30:57 +00:00

Capabilities

Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.

2012-01-02 19:46:30 +00: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

Spin off terrain save into a new thread and make it so that it uses the old

2011-12-13 12:58:28 +01:00

Framework

Merge branch 'master' into careminster

2011-12-20 21:51:43 +00:00

Region

Merge branch 'master' into careminster

2012-01-02 21:41:36 +00:00

Server

Merge branch 'master' into careminster

2012-01-02 21:41:36 +00:00

Services

Merge branch 'master' into careminster

2012-01-02 21:41:36 +00:00

Tests

Implement handler for TeleportCancel inbound packet

2011-12-10 15:17:34 +00:00

Tools

Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe

2011-12-14 16:43:49 +00:00