Tom 66dec3b874 Resolve merge commits, stage 1

2011-09-04 07:06:36 -07:00

..

Tests

rename TestHelper => TestHelpers for consistency

2011-08-06 00:31:03 +01:00

ArchiveHelpers.cs

Formatting cleanup.

2010-09-12 13:43:49 -04:00

ArchiveReadRequest.cs

Merge branch 'master' into careminster-presence-refactor

2011-06-11 12:08:02 +01:00

ArchiverModule.cs

Add a --noassets option to "save oar".

2011-05-26 01:27:01 +01:00

ArchiveWriteRequestExecution.cs

Drop current OAR version back to 0.5 since these are currently now compatible with older OpenSim versions again.

2010-12-11 01:57:32 +00:00

ArchiveWriteRequestPreparation.cs

Add --noassets option for "save iar"

2011-05-26 02:22:52 +01:00

AssetsArchiver.cs

Formatting cleanup.

2009-10-01 01:17:47 +09:00

AssetsDearchiver.cs

Changed asset CreatorID to a string

2010-02-22 14:18:59 -08:00

AssetsRequest.cs

Merge branch 'master' into careminster-presence-refactor

2011-06-20 03:11:34 +01:00