Melanie 42c82b564e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/SimStatsReporter.cs

2013-05-16 21:59:14 +01:00

..

Asset

If an asset POST does not contain well-formed XML, return a 400 (Bad Request) HTTP status rather than simply dropping the request.

2012-11-22 03:03:37 +00:00

Authentication

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00

Authorization

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Avatar

Don't store the unnecessary VERSIONMIN. VERSIONMAX, METHOD or UserID (present as column PrincipalID) parameters in the Avatars table.

2012-09-14 00:07:39 +01:00

Base

Move PluginManager

2012-10-19 07:38:36 -04:00

Freeswitch

Implement a method to allow regions to query the gridwide Freeswitch

2010-11-21 22:17:25 +00:00

Friends

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00

Grid

Switched to using the other Util function with a default value.

2013-02-27 20:59:16 -08:00

GridUser

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00

Hypergrid

Fixed mantis #6609 -- LoadPlugin error messages on Robust.

2013-05-13 13:07:39 -07:00

Inventory

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00

Land

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

Login

Fixed mantis #6609 -- LoadPlugin error messages on Robust.

2013-05-13 13:07:39 -07:00

Map

Merge branch 'avination' into careminster

2012-07-11 14:27:33 +01:00

Neighbour

Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.

2011-12-05 20:44:20 +00:00

Presence

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Simulation

Merge branch 'master' into careminster

2013-05-16 21:59:14 +01:00

UserAccounts

Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.

2012-07-13 01:03:28 +01:00