From 257fc5515ac9cb36032c2f44f040c3620ed2f328 Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 4 May 2009 15:38:36 +0000
Subject: * minor: remove some mono compiler warnings, minor cleanup

---
 OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs | 12 +++++-------
 OpenSim/Region/Framework/Scenes/Scene.cs              |  7 -------
 OpenSim/Region/Framework/Scenes/SceneBase.cs          |  4 ++--
 OpenSim/Region/Framework/Scenes/SceneObjectPart.cs    |  2 +-
 4 files changed, 8 insertions(+), 17 deletions(-)

(limited to 'OpenSim/Region/Framework')

diff --git a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
index f521490..4ef5221 100644
--- a/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
+++ b/OpenSim/Region/Framework/Scenes/RegionStatsHandler.cs
@@ -53,16 +53,15 @@ namespace OpenSim.Region.Framework.Scenes
     
                                       
     public class RegionStatsHandler : IStreamedRequestHandler
-    {
-        
+    {        
         private string osRXStatsURI = String.Empty;
         private string osXStatsURI = String.Empty;
-        private string osSecret = String.Empty;
+        //private string osSecret = String.Empty;
         private OpenSim.Framework.RegionInfo regionInfo;
         public string localZone = TimeZone.CurrentTimeZone.StandardName;
         public TimeSpan utcOffset = TimeZone.CurrentTimeZone.GetUtcOffset(DateTime.Now);
         
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public RegionStatsHandler(OpenSim.Framework.RegionInfo region_info )
         {
@@ -94,10 +93,9 @@ namespace OpenSim.Region.Framework.Scenes
         }
         
         private string Report()
-        {
-            
+        {            
             OSDMap args = new OSDMap(30);
-            int time = Util.ToUnixTime( DateTime.Now );
+            //int time = Util.ToUnixTime( DateTime.Now );
             args["OSStatsURI"] = OSD.FromString("http://" + regionInfo.ExternalHostName + ":" + regionInfo.HttpPort + "/" + osXStatsURI + "/");
             args["TimeZoneName"] = OSD.FromString(localZone);
             args["TimeZoneOffs"] = OSD.FromReal(utcOffset.TotalHours);
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 9f99305..4dc1661 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -148,8 +148,6 @@ namespace OpenSim.Region.Framework.Scenes
         protected float m_timespan = 0.089f;
         protected DateTime m_lastupdate = DateTime.Now;
 
-        protected float m_timedilation = 1.0f;
-
         private int m_update_physics = 1;
         private int m_update_entitymovement = 1;
         private int m_update_entities = 1; // Run through all objects checking for updates
@@ -230,11 +228,6 @@ namespace OpenSim.Region.Framework.Scenes
             get { return m_sceneGraph.m_syncRoot; }
         }
 
-        public float TimeDilation
-        {
-            get { return m_timedilation; }
-        }
-
         public int MaxPrimsPerFrame
         {
             get { return m_maxPrimsPerFrame; }
diff --git a/OpenSim/Region/Framework/Scenes/SceneBase.cs b/OpenSim/Region/Framework/Scenes/SceneBase.cs
index 9d8582f..6510a0c 100644
--- a/OpenSim/Region/Framework/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneBase.cs
@@ -110,14 +110,14 @@ namespace OpenSim.Region.Framework.Scenes
 
         public float TimeDilation
         {
-            get { return 1.0f; }
+            get { return m_timedilation; }
         }
+        protected float m_timedilation = 1.0f;
 
         protected ulong m_regionHandle;
         protected string m_regionName;
         protected RegionInfo m_regInfo;
 
-        //public TerrainEngine Terrain;
         public ITerrainChannel Heightmap;
 
         /// <value>
diff --git a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
index bca1a65..6b5883e 100644
--- a/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
+++ b/OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
@@ -1361,7 +1361,7 @@ if (m_shape != null) {
         /// <returns></returns>
         public SceneObjectPart Copy(uint localID, UUID AgentID, UUID GroupID, int linkNum, bool userExposed)
         {
-            SceneObjectPart dupe = (SceneObjectPart) MemberwiseClone();
+            SceneObjectPart dupe = (SceneObjectPart)MemberwiseClone();
             dupe.m_shape = m_shape.Copy();
             dupe.m_regionHandle = m_regionHandle;
             if (userExposed)
-- 
cgit v1.1