diff options
author | Dr Scofield | 2008-06-30 11:57:47 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-30 11:57:47 +0000 |
commit | 313f7f60fda81c987e0ac4da4dc8c2f5def46b72 (patch) | |
tree | 71c30ab49c97a17d157c59877842d159f5eac3e1 /OpenSim/Region/Environment/Modules/World/Archiver | |
parent | disables spam-like debugging messages inadvertently left on in last commit (o... (diff) | |
download | opensim-SC_OLD-313f7f60fda81c987e0ac4da4dc8c2f5def46b72.zip opensim-SC_OLD-313f7f60fda81c987e0ac4da4dc8c2f5def46b72.tar.gz opensim-SC_OLD-313f7f60fda81c987e0ac4da4dc8c2f5def46b72.tar.bz2 opensim-SC_OLD-313f7f60fda81c987e0ac4da4dc8c2f5def46b72.tar.xz |
properly explaining each #pragma warning disable
massaging OSHttpRequestPump to not abort on exceptions...
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs index 0115d8d..7b76cb8 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | |||
@@ -77,9 +77,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
77 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard] = ".ncd"; | 77 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard] = ".ncd"; |
78 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object] = ".oob"; | 78 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object] = ".oob"; |
79 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder] = ".rfd"; // Not sure if we'll ever see this | 79 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder] = ".rfd"; // Not sure if we'll ever see this |
80 | #pragma warning disable 0612 | 80 | // disable warning: we know Script is obsolete, but need to support it |
81 | // anyhow | ||
82 | #pragma warning disable 0612 | ||
81 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this | 83 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this |
82 | #pragma warning restore 0612 | 84 | #pragma warning restore 0612 |
83 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Simstate] = ".sst"; // Not sure if we'll ever see this | 85 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Simstate] = ".sst"; // Not sure if we'll ever see this |
84 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SnapshotFolder] = ".sfd"; // Not sure if we'll ever see this | 86 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SnapshotFolder] = ".sfd"; // Not sure if we'll ever see this |
85 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Sound] = ".ogg"; | 87 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Sound] = ".ogg"; |
@@ -102,9 +104,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
102 | EXTENSION_TO_ASSET_TYPE[".ncd"] = (sbyte)AssetType.Notecard; | 104 | EXTENSION_TO_ASSET_TYPE[".ncd"] = (sbyte)AssetType.Notecard; |
103 | EXTENSION_TO_ASSET_TYPE[".oob"] = (sbyte)AssetType.Object; | 105 | EXTENSION_TO_ASSET_TYPE[".oob"] = (sbyte)AssetType.Object; |
104 | EXTENSION_TO_ASSET_TYPE[".rfd"] = (sbyte)AssetType.RootFolder; | 106 | EXTENSION_TO_ASSET_TYPE[".rfd"] = (sbyte)AssetType.RootFolder; |
105 | #pragma warning disable 0612 | 107 | // disable warning: we know Script is obsolete, but need to support it |
108 | // anyhow | ||
109 | #pragma warning disable 0612 | ||
106 | EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script; | 110 | EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script; |
107 | #pragma warning restore 0612 | 111 | #pragma warning restore 0612 |
108 | EXTENSION_TO_ASSET_TYPE[".sst"] = (sbyte)AssetType.Simstate; | 112 | EXTENSION_TO_ASSET_TYPE[".sst"] = (sbyte)AssetType.Simstate; |
109 | EXTENSION_TO_ASSET_TYPE[".sfd"] = (sbyte)AssetType.SnapshotFolder; | 113 | EXTENSION_TO_ASSET_TYPE[".sfd"] = (sbyte)AssetType.SnapshotFolder; |
110 | EXTENSION_TO_ASSET_TYPE[".ogg"] = (sbyte)AssetType.Sound; | 114 | EXTENSION_TO_ASSET_TYPE[".ogg"] = (sbyte)AssetType.Sound; |