Melanie 578174d21c Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs

2013-02-27 18:05:04 +00:00

..

Api

Merge branch 'master' into careminster

2013-02-27 18:05:04 +00:00

CodeTools

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Instance

Merge branch 'master' into careminster

2013-02-22 01:28:54 +00: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

JustinCC's core re-merge

2013-01-16 15:47:55 +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-01-04 22:39:07 +00:00

ScriptException.cs

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

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