Melanie 8fac7c0650 Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/ServiceConnectorsOut/UserAccounts/LocalUserAccountServiceConnector.cs

2011-10-11 21:28:23 +01:00

..

ApplicationPlugins

Bring us up to date.

2011-09-14 19:11:32 -07: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 the text mode remote console really work. It can now be used to send

2010-06-08 22:05:06 +01:00

Data

Bring us up to date.

2011-09-14 19:11:32 -07:00

Framework

Bring us up to date.

2011-09-14 19:11:32 -07:00

Region

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

Server

Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

Services

Merge commit '522d6261f11ffaf8320c3f0775beb5d0608ce226' into bigmerge

2011-10-11 21:28:23 +01:00

Tests

Bring us up to date.

2011-09-14 19:11:32 -07:00

TestSuite

…

Tools

Make default serverside_object_permissions = true since this better matches user expectations.

2011-07-01 23:06:46 +01:00