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

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

2012-09-24 20:14:00 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-09-24 20:14:00 +01:00

Capabilities

Merge branch 'avination' into careminster

2012-09-16 04:21:18 +01:00

ConsoleClient

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

Data

Merge branch 'master' into careminster

2012-08-31 01:32:18 +01:00

Framework

Merge branch 'master' into careminster

2012-09-24 20:14:00 +01:00

Region

Merge branch 'master' into careminster

2012-09-24 20:14:00 +01:00

Server

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

Services

Merge branch 'master' into careminster

2012-09-24 20:14:00 +01:00

Tests

Merge branch 'master' into careminster

2012-08-31 01:32:18 +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