Melanie 005c69511d Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
	OpenSim/Region/Framework/Scenes/Scene.cs

2013-08-07 23:29:42 +01:00

..

Api

Merge branch 'master' into careminster

2013-08-07 23:29:42 +01:00

CodeTools

Fix problem with modInvoke defined integer constants being build into

2013-08-02 09:44:01 -07:00

Instance

Merge branch 'master' into careminster

2013-07-18 10:08:10 +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 NPC regression test failures.

2013-07-26 18:43:15 +01:00

AssemblyResolver.cs

…

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