Melanie 727ddffb71 Merge branch 'master' into careminster

2012-01-31 21:53:32 +00:00

..

ApplicationPlugins

Add the ability to abort a pending restart using the viewer UI or a

2012-01-28 22:19:10 +01:00

Capabilities

Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.

2012-01-06 21:07:34 +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

Merge branch 'master' into careminster

2012-01-30 21:26:47 +00:00

Framework

Merge branch 'master' into careminster

2012-01-31 21:53:32 +00:00

Region

Merge branch 'master' into careminster

2012-01-31 21:53:32 +00:00

Server

Merge branch 'master' into careminster

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

Services

Merge branch 'master' into careminster

2012-01-30 21:26:47 +00:00

Tests

Merge branch 'master' into careminster

2012-01-31 20:53:49 +00:00

Tools

minor: add missing newlines to pCampbot usage statement

2012-01-03 15:42:36 +00:00