Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor

This commit is contained in:
John Hurliman
2010-02-22 14:10:19 -08:00
94 changed files with 1068 additions and 14387 deletions

View File

@@ -73,17 +73,23 @@ namespace OpenSim.Data.Tests
a2.Data = asset1;
a3.Data = asset1;
a1.Metadata.ContentType = "application/octet-stream";
a2.Metadata.ContentType = "application/octet-stream";
a3.Metadata.ContentType = "application/octet-stream";
PropertyScrambler<AssetBase> scrambler = new PropertyScrambler<AssetBase>()
.DontScramble(x => x.Data)
.DontScramble(x => x.ID)
.DontScramble(x => x.FullID)
.DontScramble(x => x.Metadata.ID)
.DontScramble(x => x.Metadata.ContentType)
.DontScramble(x => x.Metadata.FullID);
scrambler.Scramble(a1);
scrambler.Scramble(a2);
scrambler.Scramble(a3);
db.StoreAsset(a1);
db.StoreAsset(a2);
db.StoreAsset(a3);