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

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

2012-08-04 03:00:20 +01:00

..

Tests

Fix issue where loading OARs could sometimes result in link numbers being reordered.

2012-05-15 23:43:59 +01:00

ArchiveHelpers.cs

Formatting cleanup.

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

ArchiveReadRequest.cs

Merge branch 'master' into careminster

2012-05-16 12:40:45 +01:00

ArchiverModule.cs

Add is_megaregion flag into oar control file. Not currently read - for future use. Please do not rely on this remaining here.

2012-05-19 02:45:17 +01:00

ArchiveWriteRequestExecution.cs

Fix old regression that stopped saving parcel owner data in OARs.

2012-08-03 23:49:34 +01:00

ArchiveWriteRequestPreparation.cs

Comment out accidentally left in log line that was printing out the control file on OAR save

2012-05-24 04:33:36 +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-08-03 16:46:11 +01:00