Melanie 96b50d28f4 Merge branch 'master' into careminster ... Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs		2012-09-03 14:05:18 +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	Merge branch 'master' into careminster	2012-08-31 01:32:18 +01:00
Framework	Merge branch 'avination' into careminster	2012-08-31 00:34:22 +01:00
Region	Merge branch 'master' into careminster	2012-09-03 14:05:18 +01:00
Server	Merge branch 'master' into careminster	2012-07-13 02:27:16 +01:00
Services	Merge branch 'avination' into careminster	2012-08-31 00:34:22 +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