Melanie 4ccb15290e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2014-01-28 20:47:36 +00:00

..

Api

Merge branch 'master' into careminster

2014-01-28 20:47:36 +00:00

CodeTools

Add lsl arg syntax checking for control event

2013-12-21 01:00:50 +00:00

Instance

Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster

2013-10-06 18:33:49 +01:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Tests

Extend TestLlGetNotecardLine() regression test to contain chars that are two bytes in utf8

2013-12-14 02:48:29 +00:00

AssemblyResolver.cs

Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().

2012-02-07 17:44:37 +00:00

Helpers.cs

JustinCC's core re-merge

2013-01-16 15:47:55 +00:00

LSL_Types.cs

Merge branch 'master' into careminster

2013-06-11 21:01:58 +01:00

ScriptException.cs

Also add the additional ScriptException constructor necessary to get [Serializable] to work.

2012-10-31 00:56:41 +00:00