Melanie 05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs

2013-03-29 02:15:47 +00:00

..

Agent

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00

Asset

Make sharing errors not spew and let the cache retry the files

2013-03-23 13:12:41 +01:00

Avatar

Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster

2013-03-29 02:15:47 +00:00

Framework

Merge commit 'feffc8081dc5ab2889a7ea4b96b2befaed0c3f95' into careminster

2013-03-29 01:52:58 +00:00

Hypergrid

Merge branch 'master' into careminster

2013-02-26 13:34:20 +00:00

Properties

Deleted all AssemblyFileVersion directives

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

Scripting

Merge branch 'master' into careminster

2013-03-13 02:02:46 +00:00

ServiceConnectorsIn

Another 11 modules' directions moved out of .addin.xml

2012-11-13 08:36:44 -08:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2013-03-08 01:07:05 +00:00

World

Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask

2013-03-26 03:40:06 +00:00