Melanie 68a42af30f Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge

2011-10-11 22:11:55 +01:00

..

ApplicationPlugins

Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge

2011-10-11 21:30:42 +01: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

…

Data

Merge commit 'd4043c084a86da5f462356ec5c65eab2b861564d' into bigmerge

2011-10-11 21:31:48 +01:00

Framework

Merge commit '903d5c02cb372af3fef5884d95312110229fbc1e' into bigmerge

2011-10-11 21:41:30 +01:00

Region

Merge commit 'adfe713b4340771eee15371dd1216527b5662545' into bigmerge

2011-10-11 22:11:55 +01:00

Server

Resolve merge commits, stage 1

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

Services

Merge commit '1458fab82c4dab9901d81419e6b515f47ea7320f' into bigmerge

2011-10-11 21:30:42 +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