Melanie ed1bb2081e Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge

2011-10-11 22:54:03 +01:00

..

ApplicationPlugins

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +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 '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge

2011-10-11 22:26:18 +01:00

Framework

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Region

Merge commit 'c14c4bc1ec5f381aa754068caf460c95e4539b17' into bigmerge

2011-10-11 22:54:03 +01:00

Server

Resolve merge commits, stage 1

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

Services

Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge

2011-10-11 22:51:44 +01:00

Tests

Merge commit 'd358125cac4e01194dae4b1f0bc9afc87e463f76' into bigmerge

2011-10-11 22:42:18 +01:00

TestSuite

…

Tools

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

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