Melanie e1be1c5263 Merge branch 'ubitwork'

2012-03-09 02:11:25 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-02-04 11:48:20 +00: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

Fix a merge artefact

2012-03-09 02:45:53 +00:00

Framework

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Region

Merge branch 'ubitwork'

2012-03-09 02:11:25 +01:00

Server

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Services

Merge branch 'master' into careminster

2012-03-09 02:39:14 +00:00

Tests

minor: make NPC tests run in a given order, comment out log lines in mock region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests

2012-03-07 01:11:37 +00:00

Tools

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

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