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

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

2012-08-25 23:36:33 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-06-13 02:15:12 +01:00

Capabilities

Merge branch 'master' into careminster

2012-07-13 02:27:16 +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

Fix and finish the extra parameters storage system for MySQL

2012-08-15 18:58:32 +01:00

Framework

Merge branch 'master' into careminster

2012-08-23 01:41:47 +01:00

Region

Merge branch 'master' into careminster

2012-08-25 23:36:33 +01:00

Server

Merge branch 'master' into careminster

2012-07-13 02:27:16 +01:00

Services

Merge branch 'master' into careminster

2012-08-25 23:36:33 +01:00

Tests

Merge branch 'master' into careminster

2012-08-23 01:41:47 +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