Melanie 1ece4feccd Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs

2011-12-05 19:08:19 +00:00

..

ApplicationPlugins

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

Capabilities

For the GetTexture capability, if a data range is requested that covers the whole asset length, return HTTP PartialContent instead of NotFound

2011-12-05 18:35:03 +00: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

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00

Framework

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00

Region

Fix CHANGED_TEXTURE and CHANGED_COLOR.

2011-12-05 19:01:14 +00:00

Server

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00

Services

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00

Tests

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00

Tools

Adding missing CrossBehaviour.cs file to fix build

2011-11-24 22:46:43 +00:00