Melanie 23d5bafa7f Merge branch 'master' into careminster ...

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

2012-10-03 00:24:33 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-09-29 19:21:07 +01:00

Capabilities

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

ConsoleClient

Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow."

2012-09-30 07:48:03 -07:00

Data

Merge branch 'master' into careminster

2012-09-29 19:21:07 +01:00

Framework

Allow setting connection limits, part 2

2012-09-30 16:31:23 +01:00

Region

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00

Server

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

Services

Merge branch 'master' into careminster

2012-10-03 00:24:33 +01:00

Tests

Merge branch 'avination' into careminster

2012-09-27 17:29:44 +01:00

Tools

Fix a bug in pCampbot grabbing behaviour where an exception would be thrown if the bot was not yet aware of any objects.

2012-08-01 22:30:34 +01:00