Melanie bef03fb30b Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs

2013-08-17 03:23:45 +01:00

..

Addons

minor: Eliminate one of the duplicate 'have's in the HG message telling the user if no GroupsServerURI has been given in user data by the home grid

2013-08-13 20:13:12 +01:00

ApplicationPlugins

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Capabilities

Merge branch 'master' into careminster

2013-07-24 03:50:09 +01:00

ConsoleClient

Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already.

2013-02-27 00:21:02 +00:00

Data

Merge branch 'master' into careminster

2013-07-29 02:08:05 +01:00

Framework

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Region

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Server

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Services

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Tests

Merge branch 'master' into careminster

2013-08-17 03:23:45 +01:00

Tools

Actually implement the bot request object textures switch started in 225cf0d.

2013-08-14 23:37:07 +01:00