Melanie 4a67e8b98f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Interfaces/IEstateModule.cs

2012-04-11 23:35:27 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

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

Capabilities

Guard against null inventory contents.

2012-04-06 11:22:30 -07: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-03-31 02:18:02 +01:00

Framework

Merge branch 'master' into careminster

2012-04-07 04:52:14 +01:00

Region

Merge branch 'master' into careminster

2012-04-11 23:35:27 +01:00

Server

Merge branch 'master' into careminster

2012-04-07 04:52:14 +01:00

Services

Merge branch 'master' into careminster

2012-04-11 23:35:27 +01:00

Tests

Merge branch 'master' into careminster

2012-03-31 02:18:02 +01:00

Tools

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

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