diff options
| author | Melanie | 2010-03-03 02:07:03 +0000 |
|---|---|---|
| committer | Melanie | 2010-03-03 02:07:03 +0000 |
| commit | 028a87fe37002e7a0611f66babf1deee46c83804 (patch) | |
| tree | 387aec499fd60c2012bed8148e6a2ddc847c3d95 /OpenSim/Data/Tests/PropertyScrambler.cs | |
| parent | Revert "test" (diff) | |
| parent | Fixes Region.Framework tests. Although these tests don't fail, they need to b... (diff) | |
| download | opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.zip opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.gz opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.bz2 opensim-SC_OLD-028a87fe37002e7a0611f66babf1deee46c83804.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
This brings careminster on the level of master. To be tested
Diffstat (limited to 'OpenSim/Data/Tests/PropertyScrambler.cs')
| -rw-r--r-- | OpenSim/Data/Tests/PropertyScrambler.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/Tests/PropertyScrambler.cs b/OpenSim/Data/Tests/PropertyScrambler.cs index c968364..132294a 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", (sbyte)AssetType.Texture); | 168 | AssetBase actual = new AssetBase(UUID.Random(), "asset one", (sbyte)AssetType.Texture, UUID.Zero.ToString()); |
| 169 | new PropertyScrambler<AssetBase>().Scramble(actual); | 169 | new PropertyScrambler<AssetBase>().Scramble(actual); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| @@ -173,7 +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(uuid, "asset", (sbyte)AssetType.Texture); | 176 | AssetBase asset = new AssetBase(uuid, "asset", (sbyte)AssetType.Texture, UUID.Zero.ToString()); |
| 177 | new PropertyScrambler<AssetBase>() | 177 | new PropertyScrambler<AssetBase>() |
| 178 | .DontScramble(x => x.Metadata) | 178 | .DontScramble(x => x.Metadata) |
| 179 | .DontScramble(x => x.FullID) | 179 | .DontScramble(x => x.FullID) |