Melanie afae9eafbe Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2011-11-02 12:34:57 +00:00

..

ApplicationPlugins

Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge

2011-10-25 03:18:23 +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 OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

Data

Plug a security hole in the inventory service

2011-10-31 11:11:36 +00:00

Framework

Merge branch 'master' into bigmerge

2011-10-26 17:48:51 +01:00

Region

Merge branch 'master' into bigmerge

2011-11-02 12:34:57 +00:00

Server

Merge branch 'master' into bigmerge

2011-10-26 01:27:24 +01:00

Services

Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge

2011-10-25 03:26:09 +01:00

Tests

Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge

2011-10-25 03:19:10 +01:00

Tools

Add "appearance send" command to allow manual sending of appearance.

2011-11-01 23:23:45 +00:00