aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/Tests/BasicAssetTest.cs
diff options
context:
space:
mode:
authorJohn Hurliman2010-02-22 14:10:19 -0800
committerJohn Hurliman2010-02-22 14:10:19 -0800
commit71c6559a91a58d93588dcdd8c74b5fce0c1a3780 (patch)
treecca5b1ea88ad4b29156767afdd77e37ec072c8a7 /OpenSim/Data/Tests/BasicAssetTest.cs
parent* Adds CreatorID to asset metadata. This is just the plumbing to support Crea... (diff)
parentMerge branch 'presence-refactor' of ssh://diva@opensimulator.org/var/git/open... (diff)
downloadopensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.zip
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.gz
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.bz2
opensim-SC-71c6559a91a58d93588dcdd8c74b5fce0c1a3780.tar.xz
Merge branch 'presence-refactor' of ssh://opensimulator.org/var/git/opensim into presence-refactor
Diffstat (limited to 'OpenSim/Data/Tests/BasicAssetTest.cs')
-rw-r--r--OpenSim/Data/Tests/BasicAssetTest.cs6
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
73 a2.Data = asset1; 73 a2.Data = asset1;
74 a3.Data = asset1; 74 a3.Data = asset1;
75 75
76 a1.Metadata.ContentType = "application/octet-stream";
77 a2.Metadata.ContentType = "application/octet-stream";
78 a3.Metadata.ContentType = "application/octet-stream";
79
76 PropertyScrambler<AssetBase> scrambler = new PropertyScrambler<AssetBase>() 80 PropertyScrambler<AssetBase> scrambler = new PropertyScrambler<AssetBase>()
77 .DontScramble(x => x.Data) 81 .DontScramble(x => x.Data)
78 .DontScramble(x => x.ID) 82 .DontScramble(x => x.ID)
79 .DontScramble(x => x.FullID) 83 .DontScramble(x => x.FullID)
80 .DontScramble(x => x.Metadata.ID) 84 .DontScramble(x => x.Metadata.ID)
85 .DontScramble(x => x.Metadata.ContentType)
81 .DontScramble(x => x.Metadata.FullID); 86 .DontScramble(x => x.Metadata.FullID);
82 87
83 scrambler.Scramble(a1); 88 scrambler.Scramble(a1);
84 scrambler.Scramble(a2); 89 scrambler.Scramble(a2);
85 scrambler.Scramble(a3); 90 scrambler.Scramble(a3);
86 91
92
87 db.StoreAsset(a1); 93 db.StoreAsset(a1);
88 db.StoreAsset(a2); 94 db.StoreAsset(a2);
89 db.StoreAsset(a3); 95 db.StoreAsset(a3);