Merge branch 'master' into presence-refactor

author: Melanie 2010-01-04 21:41:33 +0000
committer: Melanie 2010-01-04 21:41:33 +0000
commit: 7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch)
tree: badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
parent: Forgot to add these to the grid configs, so that logins work. (diff)
parent: Finish conversion if XInventoryService (diff)
download: opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2
opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
index af72968..52add23 100644
--- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
+++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
            List<string> serialisedParcels = new List<string>();
            string filePath = "NONE";
-            TarArchiveReader archive = new TarArchiveReader(m_loadStream);          
+            TarArchiveReader archive = new TarArchiveReader(m_loadStream);
            byte[] data;
            TarArchiveReader.TarEntryType entryType;
author	Melanie	2010-01-04 21:41:33 +0000
committer	Melanie	2010-01-04 21:41:33 +0000
commit	7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc (patch)
tree	badbb6fd767ff6127c28d339677febd9356d80b0 /OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
parent	Forgot to add these to the grid configs, so that logins work. (diff)
parent	Finish conversion if XInventoryService (diff)
download	opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.zip opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.gz opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.bz2 opensim-SC_OLD-7f960cd5950129c8ae9ae8d0aa92efbf9ce3c0cc.tar.xz

diff --git a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs index af72968..52add23 100644 --- a/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs +++ b/OpenSim/Region/CoreModules/World/Archiver/ArchiveReadRequest.cs
@@ -104,7 +104,7 @@ namespace OpenSim.Region.CoreModules.World.Archiver
104	List<string> serialisedParcels = new List<string>();	104	List<string> serialisedParcels = new List<string>();
105	string filePath = "NONE";	105	string filePath = "NONE";
106		106
107	TarArchiveReader archive = new TarArchiveReader(m_loadStream);	107	TarArchiveReader archive = new TarArchiveReader(m_loadStream);
108	byte[] data;	108	byte[] data;
109	TarArchiveReader.TarEntryType entryType;	109	TarArchiveReader.TarEntryType entryType;
110		110