diff options
author | Dr Scofield | 2008-06-27 23:03:39 +0000 |
---|---|---|
committer | Dr Scofield | 2008-06-27 23:03:39 +0000 |
commit | 748f72326d9a295958bc9ba63bbb1a5d39030ef7 (patch) | |
tree | 58f2c9a5f6b8ffab5ad3621070aa17cb1c1e3e6b /OpenSim/Region/Environment/Modules/World/Archiver | |
parent | more warnings to go. (diff) | |
download | opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.zip opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.gz opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.bz2 opensim-SC-748f72326d9a295958bc9ba63bbb1a5d39030ef7.tar.xz |
last round of warning squashing. calling it a day now.
Diffstat (limited to 'OpenSim/Region/Environment/Modules/World/Archiver')
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | 4 | ||||
-rw-r--r-- | OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs index 0766c95..f4586b0 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs | |||
@@ -72,7 +72,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
72 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard] = ".ncd"; | 72 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Notecard] = ".ncd"; |
73 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object] = ".oob"; | 73 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Object] = ".oob"; |
74 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder] = ".rfd"; // Not sure if we'll ever see this | 74 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.RootFolder] = ".rfd"; // Not sure if we'll ever see this |
75 | #pragma warning disable 0612 | ||
75 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this | 76 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this |
77 | #pragma warning restore 0612 | ||
76 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Simstate] = ".sst"; // Not sure if we'll ever see this | 78 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Simstate] = ".sst"; // Not sure if we'll ever see this |
77 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SnapshotFolder] = ".sfd"; // Not sure if we'll ever see this | 79 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.SnapshotFolder] = ".sfd"; // Not sure if we'll ever see this |
78 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Sound] = ".ogg"; | 80 | ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Sound] = ".ogg"; |
@@ -95,7 +97,9 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
95 | EXTENSION_TO_ASSET_TYPE[".ncd"] = (sbyte)AssetType.Notecard; | 97 | EXTENSION_TO_ASSET_TYPE[".ncd"] = (sbyte)AssetType.Notecard; |
96 | EXTENSION_TO_ASSET_TYPE[".oob"] = (sbyte)AssetType.Object; | 98 | EXTENSION_TO_ASSET_TYPE[".oob"] = (sbyte)AssetType.Object; |
97 | EXTENSION_TO_ASSET_TYPE[".rfd"] = (sbyte)AssetType.RootFolder; | 99 | EXTENSION_TO_ASSET_TYPE[".rfd"] = (sbyte)AssetType.RootFolder; |
100 | #pragma warning disable 0612 | ||
98 | EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script; | 101 | EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script; |
102 | #pragma warning restore 0612 | ||
99 | EXTENSION_TO_ASSET_TYPE[".sst"] = (sbyte)AssetType.Simstate; | 103 | EXTENSION_TO_ASSET_TYPE[".sst"] = (sbyte)AssetType.Simstate; |
100 | EXTENSION_TO_ASSET_TYPE[".sfd"] = (sbyte)AssetType.SnapshotFolder; | 104 | EXTENSION_TO_ASSET_TYPE[".sfd"] = (sbyte)AssetType.SnapshotFolder; |
101 | EXTENSION_TO_ASSET_TYPE[".ogg"] = (sbyte)AssetType.Sound; | 105 | EXTENSION_TO_ASSET_TYPE[".ogg"] = (sbyte)AssetType.Sound; |
diff --git a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs index ae3d333..69f712c 100644 --- a/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs +++ b/OpenSim/Region/Environment/Modules/World/Archiver/ArchiverModule.cs | |||
@@ -42,7 +42,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver | |||
42 | /// </summary> | 42 | /// </summary> |
43 | public class ArchiverModule : IRegionModule, IRegionArchiver | 43 | public class ArchiverModule : IRegionModule, IRegionArchiver |
44 | { | 44 | { |
45 | private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); | 45 | // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); |
46 | 46 | ||
47 | /// <summary> | 47 | /// <summary> |
48 | /// Scene to which this module belongs | 48 | /// Scene to which this module belongs |