Melanie 771d79e83e Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Framework/Monitoring/BaseStatsCollector.cs
	OpenSim/Region/Application/OpenSim.cs
	OpenSim/Region/Application/OpenSimBase.cs
	OpenSim/Region/Framework/Scenes/SceneManager.cs
	bin/OpenMetaverse.Rendering.Meshmerizer.dll
	bin/OpenMetaverse.StructuredData.dll
	bin/OpenMetaverse.dll
	bin/OpenMetaverseTypes.dll
	prebuild.xml

2012-07-28 00:39:36 +01:00

..

Api

Merge branch 'master' into careminster

2012-07-28 00:39:36 +01:00

CodeTools

Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.

2012-07-11 22:54:22 +01:00

Instance

Merge branch 'master' into careminster

2012-07-19 09:47:51 +01:00

Tests

Disable logging in regression test in OSSL_ApiAttachmentTests

2012-07-10 23:04:44 +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

Merge branch 'master' into careminster

2012-07-23 18:54:12 +01:00

LSL_Types.cs

llListSort SL compatibility: When sorting strided list and the list

2012-03-05 11:54:06 +01:00