Melanie bbaf2c5a80 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs

2012-09-24 20:14:00 +01:00

..

Tests

Correctly override and call base OpenSimTestCase.SetUp() method in GridConnectorsTests and ArchiverTests.

2012-09-19 01:06:42 +01:00

ArchiveHelpers.cs

Formatting cleanup.

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

ArchiveReadRequest.cs

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

ArchiverModule.cs

Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.

2012-09-14 20:25:44 +01:00

ArchiveScenesGroup.cs

Support multi-region OAR files

2012-09-14 20:25:03 +01:00

ArchiveWriteRequest.cs

Rename ArchiveWriteRequestPreparatio nto ArchiveWriteRequest since after the multi-OAR patch there is now only one class that handles this operation.

2012-09-14 20:25:44 +01:00

AssetsArchiver.cs

Formatting cleanup.

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

AssetsDearchiver.cs

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

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

AssetsRequest.cs

Merge branch 'master' into careminster

2012-09-16 04:11:20 +01:00

DearchiveScenesGroup.cs

Support multi-region OAR files

2012-09-14 20:25:03 +01:00