Melanie 053e7279ca Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2012-08-14 02:11:13 +01:00

..

Api

Merge branch 'master' into careminster

2012-08-14 02:11:13 +01:00

CodeTools

Adds support to ScriptModuleComms for region modules to export

2012-07-31 10:45:37 -07: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