diff options
author | Melanie | 2012-01-21 19:52:33 +0000 |
---|---|---|
committer | Melanie | 2012-01-21 19:52:33 +0000 |
commit | ba3b0c69f11aaa3b4305cddd57099e98325a146d (patch) | |
tree | cf70355a8cac0579354e67eeb3632a6706d41012 /OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |
parent | Add some logging (diff) | |
parent | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim (diff) | |
download | opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.zip opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.gz opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.bz2 opensim-SC_OLD-ba3b0c69f11aaa3b4305cddd57099e98325a146d.tar.xz |
Merge branch 'master' into careminster
Diffstat (limited to 'OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs index e798e5e..eec3c1b 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/Tests/ArchiverTests.cs | |||
@@ -344,7 +344,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver.Tests | |||
344 | { | 344 | { |
345 | using (BinaryReader br = new BinaryReader(resource)) | 345 | using (BinaryReader br = new BinaryReader(resource)) |
346 | { | 346 | { |
347 | // FIXME: Use the inspector insteadthere are so many forums and lists already, though admittedly none of them are suitable for cross virtual-enivornemnt discussion | 347 | // FIXME: Use the inspector instead |
348 | soundData = br.ReadBytes(99999999); | 348 | soundData = br.ReadBytes(99999999); |
349 | UUID soundUuid = UUID.Parse("00000000-0000-0000-0000-000000000001"); | 349 | UUID soundUuid = UUID.Parse("00000000-0000-0000-0000-000000000001"); |
350 | string soundAssetFileName | 350 | string soundAssetFileName |