Melanie b62cc3ce0a Merge branch 'avination' into careminster

2012-05-05 10:32:22 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

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

Capabilities

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

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-30 19:04:38 +01:00

Framework

Merge branch 'avination' into careminster

2012-05-05 10:32:22 +01:00

Region

Merge branch 'avination' into careminster

2012-05-05 10:32:22 +01:00

Server

Merge branch 'master' into careminster

2012-05-05 10:32:04 +01:00

Services

Merge branch 'master' into careminster

2012-05-05 10:32:04 +01:00

Tests

Merge branch 'master' into careminster

2012-05-02 01:37:51 +01:00

Tools

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

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