From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 23:03:39 +0000
Subject: last round of warning squashing. calling it a day now.
---
.../Modules/World/Archiver/ArchiveConstants.cs | 4 ++++
.../Modules/World/Archiver/ArchiverModule.cs | 2 +-
.../Environment/Modules/World/NPC/NPCModule.cs | 16 +++++++--------
.../Environment/Modules/World/Sun/SunModule.cs | 24 +++++++++++-----------
OpenSim/Region/Environment/Scenes/Scene.cs | 2 +-
.../Region/Environment/Scenes/SceneObjectGroup.cs | 4 ++--
.../Region/Environment/Scenes/SceneObjectPart.cs | 2 +-
7 files changed, 29 insertions(+), 25 deletions(-)
(limited to 'OpenSim/Region/Environment')
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
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
ASSET_TYPE_TO_EXTENSION[(sbyte)AssetType.Script] = ".spt"; // Not sure if we'll ever see this
+ #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";
@@ -95,7 +97,9 @@ 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
EXTENSION_TO_ASSET_TYPE[".spt"] = (sbyte)AssetType.Script;
+ #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;
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
///
public class ArchiverModule : IRegionModule, IRegionArchiver
{
- private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+ // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
///
/// Scene to which this module belongs
diff --git a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
index 32a3cc4..86472f6 100644
--- a/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/NPC/NPCModule.cs
@@ -34,17 +34,17 @@ namespace OpenSim.Region.Environment.Modules.World.NPC
{
public class NPCModule : IRegionModule
{
- private const bool m_enabled = false;
+ // private const bool m_enabled = false;
public void Initialise(Scene scene, IConfigSource source)
{
- if (m_enabled)
- {
- NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new LLVector3(128, 128, 40), scene);
- NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new LLVector3(136, 128, 40), scene);
- scene.AddNewClient(testAvatar, false);
- scene.AddNewClient(testAvatar2, false);
- }
+ // if (m_enabled)
+ // {
+ // NPCAvatar testAvatar = new NPCAvatar("Jack", "NPC", new LLVector3(128, 128, 40), scene);
+ // NPCAvatar testAvatar2 = new NPCAvatar("Jill", "NPC", new LLVector3(136, 128, 40), scene);
+ // scene.AddNewClient(testAvatar, false);
+ // scene.AddNewClient(testAvatar2, false);
+ // }
}
public void PostInitialise()
diff --git a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
index bb4a568..f73c193 100644
--- a/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
+++ b/OpenSim/Region/Environment/Modules/World/Sun/SunModule.cs
@@ -57,16 +57,16 @@ namespace OpenSim.Region.Environment.Modules
private double m_day_length = 0;
private int m_year_length = 0;
private double m_day_night = 0;
- private double m_longitude = 0;
- private double m_latitude = 0;
+ // private double m_longitude = 0;
+ // private double m_latitude = 0;
// Configurable defaults Defaults close to SL
private string d_mode = "SL";
private int d_frame_mod = 100; // Every 10 seconds (actually less)
private double d_day_length = 4; // A VW day is 4 RW hours long
private int d_year_length = 60; // There are 60 VW days in a VW year
private double d_day_night = 0.45; // axis offset: ratio of light-to-dark, approx 1:3
- private double d_longitude = -73.53;
- private double d_latitude = 41.29;
+ // private double d_longitude = -73.53;
+ // private double d_latitude = 41.29;
// Frame counter
private uint m_frame = 0;
@@ -80,7 +80,7 @@ namespace OpenSim.Region.Environment.Modules
private uint SecondsPerYear; // Length of a virtual year in RW seconds
private double SunSpeed; // Rate of passage in radians/second
private double SeasonSpeed; // Rate of change for seasonal effects
- private double HoursToRadians; // Rate of change for seasonal effects
+ // private double HoursToRadians; // Rate of change for seasonal effects
private long TicksOffset = 0; // seconds offset from UTC
// Calculated every update
private float OrbitalPosition; // Orbital placement at a point in time
@@ -88,7 +88,7 @@ namespace OpenSim.Region.Environment.Modules
private double TotalDistanceTravelled; // Distance since beginning of time (in radians)
private double SeasonalOffset; // Seaonal variation of tilt
private float Magnitude; // Normal tilt
- private double VWTimeRatio; // VW time as a ratio of real time
+ // private double VWTimeRatio; // VW time as a ratio of real time
// Working values
private LLVector3 Position = new LLVector3(0,0,0);
@@ -173,9 +173,9 @@ namespace OpenSim.Region.Environment.Modules
// Mode: determines how the sun is handled
m_mode = config.Configs["Sun"].GetString("mode", d_mode);
// Mode: determines how the sun is handled
- m_latitude = config.Configs["Sun"].GetDouble("latitude", d_latitude);
+ // m_latitude = config.Configs["Sun"].GetDouble("latitude", d_latitude);
// Mode: determines how the sun is handled
- m_longitude = config.Configs["Sun"].GetDouble("longitude", d_longitude);
+ // m_longitude = config.Configs["Sun"].GetDouble("longitude", d_longitude);
// Day length in decimal hours
m_year_length = config.Configs["Sun"].GetInt("year_length", d_year_length);
// Day length in decimal hours
@@ -193,8 +193,8 @@ namespace OpenSim.Region.Environment.Modules
m_day_length = d_day_length;
m_day_night = d_day_night;
m_frame_mod = d_frame_mod;
- m_latitude = d_latitude;
- m_longitude = d_longitude;
+ // m_latitude = d_latitude;
+ // m_longitude = d_longitude;
}
switch (m_mode)
@@ -209,7 +209,7 @@ namespace OpenSim.Region.Environment.Modules
// Ration of real-to-virtual time
- VWTimeRatio = 24/m_day_length;
+ // VWTimeRatio = 24/m_day_length;
// Speed of rotation needed to complete a cycle in the
// designated period (day and season)
@@ -220,7 +220,7 @@ namespace OpenSim.Region.Environment.Modules
// Horizon translation
HorizonShift = m_day_night; // Z axis translation
- HoursToRadians = (SunCycle/24)*VWTimeRatio;
+ // HoursToRadians = (SunCycle/24)*VWTimeRatio;
// Insert our event handling hooks
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 3879b57..b7117df 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -72,7 +72,7 @@ namespace OpenSim.Region.Environment.Scenes
public InnerScene m_innerScene;
- private Random Rand = new Random();
+ // private Random Rand = new Random();
private uint _primCount = 720000;
private readonly Mutex _primAllocateMutex = new Mutex(false);
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
index 74f9d6c..4a24dad 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.cs
@@ -87,7 +87,7 @@ namespace OpenSim.Region.Environment.Scenes
///
public partial class SceneObjectGroup : EntityBase
{
- private PrimCountTaintedDelegate handlerPrimCountTainted = null;
+ // private PrimCountTaintedDelegate handlerPrimCountTainted = null;
///
/// Signal whether the non-inventory attributes of any prims in the group have changed
@@ -107,7 +107,7 @@ namespace OpenSim.Region.Environment.Scenes
protected ulong m_regionHandle;
protected SceneObjectPart m_rootPart;
- private Dictionary m_scriptEvents = new Dictionary();
+ // private Dictionary m_scriptEvents = new Dictionary();
private Dictionary m_targets = new Dictionary();
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
index b610477..7b04c82 100644
--- a/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneObjectPart.cs
@@ -169,7 +169,7 @@ namespace OpenSim.Region.Environment.Scenes
private Color m_color = Color.Black;
private string m_description = String.Empty;
private List m_lastColliders = new List();
- private PhysicsVector m_lastRotationalVelocity = PhysicsVector.Zero;
+ // private PhysicsVector m_lastRotationalVelocity = PhysicsVector.Zero;
private int m_linkNum = 0;
[XmlIgnore]
private int m_scriptAccessPin = 0;
--
cgit v1.1