From 313f7f60fda81c987e0ac4da4dc8c2f5def46b72 Mon Sep 17 00:00:00 2001 From: Dr Scofield Date: Mon, 30 Jun 2008 11:57:47 +0000 Subject: properly explaining each #pragma warning disable massaging OSHttpRequestPump to not abort on exceptions... --- .../Environment/Modules/World/Archiver/ArchiveConstants.cs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs') 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 ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard] = ".ncd"; ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object] = ".oob"; ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder] = ".rfd"; // Not sure if we'll ever see this - #pragma warning disable 0612 +// disable warning: we know Script is obsolete, but need to support it +// anyhow +#pragma warning disable 0612 ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this - #pragma warning restore 0612 +#pragma warning restore 0612 ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Simstate] = ".sst"; // Not sure if we'll ever see this ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SnapshotFolder] = ".sfd"; // Not sure if we'll ever see this ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Sound] = ".ogg"; @@ -102,9 +104,11 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver EXTENSION_TO_ASSET_TYPE[".ncd"] = (sbyte)AssetType.Notecard; EXTENSION_TO_ASSET_TYPE[".oob"] = (sbyte)AssetType.Object; EXTENSION_TO_ASSET_TYPE[".rfd"] = (sbyte)AssetType.RootFolder; - #pragma warning disable 0612 +// disable warning: we know Script is obsolete, but need to support it +// anyhow +#pragma warning disable 0612 EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script; - #pragma warning restore 0612 +#pragma warning restore 0612 EXTENSION_TO_ASSET_TYPE[".sst"] = (sbyte)AssetType.Simstate; EXTENSION_TO_ASSET_TYPE[".sfd"] = (sbyte)AssetType.SnapshotFolder; EXTENSION_TO_ASSET_TYPE[".ogg"] = (sbyte)AssetType.Sound; -- cgit v1.1