Melanie cc1fe354d0 Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs

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

…

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 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge

2011-10-11 21:21:44 +01:00

Server

Resolve merge commits, stage 1

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

Services

Bring us up to date.

2011-09-14 19:11:32 -07: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