Melanie d1e681f682 Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs

2011-10-11 23:14:23 +01:00

..

ApplicationPlugins

Merge commit 'e789ab659c8a35a32f4edfc8f79f367b9a993721' into bigmerge

2011-10-11 23:02:04 +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

Make the text mode remote console really work. It can now be used to send

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

Data

Merge commit '7ec7a3cf33b3a67cb10df14bad04cf6f09262822' into bigmerge

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

Framework

Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +01:00

Region

Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmerge

2011-10-11 23:14:23 +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

Added a setting to [Startup] section of config that will allow the simulator to start up with no regions configured.

2011-09-24 01:59:02 +01:00