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

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2011-11-14 20:03:47 +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-14 20:03:47 +00:00

Framework

Merge branch 'master' into bigmerge

2011-11-12 12:36:52 +00:00

Region

Merge branch 'master' into bigmerge

2011-11-14 20:03:47 +00:00

Server

Merge branch 'master' into bigmerge

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

Services

Make log messages on authentication failure more explicit

2011-11-11 23:45:08 +00:00

Tests

Merge branch 'master' into bigmerge

2011-11-14 20:03:47 +00:00

Tools

launch pCampbot shutdown console comand asynchronously

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