Melanie 6d6b9ab791 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2013-12-07 01:08:49 +00:00

..

Api

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

CodeTools

Add parameter checking for land_collision, land_collision_start and land_collision_end lsl events

2013-11-29 00:44:53 +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

Fix bug where using PRIM_LINK_TARGET with only two remaining list items (e.g. link number then PRIM_ROTATION) would not return the parameter

2013-09-16 23:00:40 +01: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