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

1 files changed, 6 insertions, 0 deletions

diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 58a17c2..9ec294d 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -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);