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

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-01-28 04:05:53 +00:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-01-06 22:41:26 +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

Completely disable NPC being sensed as agents, the abuse potential is too great

2012-01-28 03:12:56 +01:00

Framework

Merge branch 'master' into careminster

2012-01-28 01:01:23 +00:00

Region

Merge branch 'master' into careminster

2012-01-28 04:05:53 +00:00

Server

Merge branch 'master' into careminster

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

Services

Merge branch 'master' into careminster

2012-01-27 19:47:24 +00:00

Tests

Merge branch 'master' into careminster

2012-01-21 19:52:33 +00:00

Tools

minor: add missing newlines to pCampbot usage statement

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