Melanie 556d70feef Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs

2012-11-13 17:37:39 +00:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-11-12 23:27:47 +00:00

Capabilities

minor: Comment out "Client requested range for texture ... but" message. This is not useful during normal operation.

2012-10-12 00:27:12 +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-11-09 22:58:42 +00:00

Framework

Merge branch 'master' into careminster

2012-10-31 21:42:06 +00:00

Region

Merge branch 'master' into careminster

2012-11-13 17:37:39 +00:00

Server

Merge branch 'master' into careminster

2012-11-03 15:38:47 +00:00

Services

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

Tests

Merge branch 'master' into careminster

2012-11-13 10:49:24 +00: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