Melanie a4ec97cfdd Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs

2011-11-11 23:43:18 +00:00

..

ApplicationPlugins

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

Capabilities

Save the default terrain texture UUIDs for a new region instead of leaving them as UUID.Zero.

2011-09-09 00:38:04 +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 bigmerge

2011-11-03 00:06:14 +00:00

Framework

Merge branch 'master' into bigmerge

2011-11-10 17:35:35 +00:00

Region

Merge branch 'master' into bigmerge

2011-11-11 23:43:18 +00:00

Server

Merge branch 'master' into bigmerge

2011-11-03 00:06:14 +00:00

Services

Merge branch 'master' into bigmerge

2011-11-11 23:43:18 +00:00

Tests

Convert SendKillObject to take a list of uint rather than sending one

2011-11-06 20:38:07 +00:00

Tools

launch pCampbot shutdown console comand asynchronously

2011-11-10 20:03:36 +00:00