diff options
| author | KittoFlora | 2009-11-15 22:20:51 +0100 |
|---|---|---|
| committer | KittoFlora | 2009-11-15 22:20:51 +0100 |
| commit | ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee (patch) | |
| tree | e218f290178d98e63aa8ab6aef46c1715195c32e /OpenSim/Data/Tests/PropertyScrambler.cs | |
| parent | Merge branch 'master' into vehicles (diff) | |
| parent | Make GroupRootUpdate be a terse update. This method is not used by opensim (i... (diff) | |
| download | opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.zip opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.gz opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.bz2 opensim-SC_OLD-ba77f0c2ac9e41d7c8ca00ddf4b68bc4f25deaee.tar.xz | |
Merge branch 'master' into vehicles
Diffstat (limited to 'OpenSim/Data/Tests/PropertyScrambler.cs')
| -rw-r--r-- | OpenSim/Data/Tests/PropertyScrambler.cs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index 72aaff1..c968364 100644 --- a/OpenSim/Data/Tests/PropertyScrambler.cs +++ b/OpenSim/Data/Tests/PropertyScrambler.cs | |||
| @@ -165,7 +165,7 @@ namespace OpenSim.Data.Tests | |||
| 165 | [Test] | 165 | [Test] |
| 166 | public void TestScramble() | 166 | public void TestScramble() |
| 167 | { | 167 | { |
| 168 | AssetBase actual = new AssetBase(UUID.Random(), "asset one"); | 168 | AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture); |
| 169 | new PropertyScrambler<AssetBase>().Scramble(actual); | 169 | new PropertyScrambler<AssetBase>().Scramble(actual); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| @@ -173,8 +173,7 @@ namespace OpenSim.Data.Tests | |||
| 173 | public void DontScramble() | 173 | public void DontScramble() |
| 174 | { | 174 | { |
| 175 | UUID uuid = UUID.Random(); | 175 | UUID uuid = UUID.Random(); |
| 176 | AssetBase asset = new AssetBase(); | 176 | AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture); |
| 177 | asset.FullID = uuid; | ||
| 178 | new PropertyScrambler<AssetBase>() | 177 | new PropertyScrambler<AssetBase>() |
| 179 | .DontScramble(x => x.Metadata) | 178 | .DontScramble(x => x.Metadata) |
| 180 | .DontScramble(x => x.FullID) | 179 | .DontScramble(x => x.FullID) |