aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-01-30 21:04:23 +0000
committerJustin Clarke Casey2009-01-30 21:04:23 +0000
commit951c08933aa290b0cf64d924b6b2a7a92a66a6fa (patch)
treecbf3fbb7f08a989240e0894d5bffe5f57571d0cb /OpenSim
parent* Extend archive save test to check for the presence of the file for the obje... (diff)
downloadopensim-SC_OLD-951c08933aa290b0cf64d924b6b2a7a92a66a6fa.zip
opensim-SC_OLD-951c08933aa290b0cf64d924b6b2a7a92a66a6fa.tar.gz
opensim-SC_OLD-951c08933aa290b0cf64d924b6b2a7a92a66a6fa.tar.bz2
opensim-SC_OLD-951c08933aa290b0cf64d924b6b2a7a92a66a6fa.tar.xz
* In OpenSim.ini.example, list defaults for AllowOSFunctions and OSFunctionThreatLevel and change existing OpenSim.ini.example settings
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs53
1 files changed, 27 insertions, 26 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
index c8ae224..3862546 100644
--- a/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
+++ b/OpenSim/Region/Environment/Modules/World/Archiver/TarArchiveReader.cs
@@ -128,34 +128,35 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
128 128
129 switch (header[156]) 129 switch (header[156])
130 { 130 {
131 case 0: 131 case 0:
132 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE; 132 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
133 break;
134 case (byte)'0':
135 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
136 break;
137 case (byte)'1':
138 tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK;
139 break;
140 case (byte)'2':
141 tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK;
142 break;
143 case (byte)'3':
144 tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL;
145 break;
146 case (byte)'4':
147 tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL;
148 break;
149 case (byte)'5':
150 tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY;
151 break;
152 case (byte)'6':
153 tarHeader.EntryType = TarEntryType.TYPE_FIFO;
154 break;
155 case (byte)'7':
156 tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE;
133 break; 157 break;
134 case (byte)'0':
135 tarHeader.EntryType = TarEntryType.TYPE_NORMAL_FILE;
136 break;
137 case (byte)'1':
138 tarHeader.EntryType = TarEntryType.TYPE_HARD_LINK;
139 break;
140 case (byte)'2':
141 tarHeader.EntryType = TarEntryType.TYPE_SYMBOLIC_LINK;
142 break;
143 case (byte)'3':
144 tarHeader.EntryType = TarEntryType.TYPE_CHAR_SPECIAL;
145 break;
146 case (byte)'4':
147 tarHeader.EntryType = TarEntryType.TYPE_BLOCK_SPECIAL;
148 break;
149 case (byte)'5':
150 tarHeader.EntryType = TarEntryType.TYPE_DIRECTORY;
151 break;
152 case (byte)'6':
153 tarHeader.EntryType = TarEntryType.TYPE_FIFO;
154 break;
155 case (byte)'7':
156 tarHeader.EntryType = TarEntryType.TYPE_CONTIGUOUS_FILE;
157 break;
158 } 158 }
159
159 return tarHeader; 160 return tarHeader;
160 } 161 }
161 162