aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Environment
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Region/Environment')
-rw-r--r--OpenSim/Region/Environment/Modules/World/Archiver/ArchiveConstants.cs12
-rw-r--r--OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs5
2 files changed, 11 insertions, 6 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;
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
index 5d94407..a8ad56f 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCAvatar.cs
@@ -139,8 +139,9 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
139 #endregion 139 #endregion
140 140
141 #region Event Definitions IGNORE 141 #region Event Definitions IGNORE
142#pragma warning disable 67
143 142
143// disable warning: public events constituting public API
144#pragma warning disable 67
144 public event Action<IClientAPI> OnLogout; 145 public event Action<IClientAPI> OnLogout;
145 public event ObjectPermissions OnObjectPermissions; 146 public event ObjectPermissions OnObjectPermissions;
146 147
@@ -294,8 +295,8 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
294 public event GetScriptRunning OnGetScriptRunning; 295 public event GetScriptRunning OnGetScriptRunning;
295 public event SetScriptRunning OnSetScriptRunning; 296 public event SetScriptRunning OnSetScriptRunning;
296 public event UpdateVector OnAutoPilotGo; 297 public event UpdateVector OnAutoPilotGo;
297
298#pragma warning restore 67 298#pragma warning restore 67
299
299 #endregion 300 #endregion
300 301
301 #region Overrriden Methods IGNORE 302 #region Overrriden Methods IGNORE