Merge branch 'master' into careminster

2 files changed, 5 insertions, 15 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 3034f9a..c12c81b 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -4410,16 +4410,6 @@ namespace OpenSim.Region.Framework.Scenes
 
         #endregion
 
-        #region Avatar Appearance Default
-
-        public static void GetDefaultAvatarAppearance(out AvatarWearable[] wearables, out byte[] visualParams)
-        {
-            visualParams = AvatarAppearance.GetDefaultVisualParams();
-            wearables = AvatarWearable.DefaultWearables;
-        }
-
-        #endregion
-
         public void RegionHandleRequest(IClientAPI client, UUID regionID)
         {
             ulong handle = 0;
diff --git a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
index 56c6ed6..3b5455f 100644
--- a/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
+++ b/OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
@@ -238,7 +238,7 @@ namespace OpenSim.Region.Framework.Scenes
                 sb[12].StatValue = m_otherMS / statsUpdateFactor;
 
                 sb[13].StatID = (uint)Stats.InPacketsPerSecond;
-                sb[13].StatValue = (m_inPacketsPerSecond);
+                sb[13].StatValue = (m_inPacketsPerSecond / statsUpdateFactor);
 
                 sb[14].StatID = (uint)Stats.OutPacketsPerSecond;
                 sb[14].StatValue = (m_outPacketsPerSecond / statsUpdateFactor);
@@ -285,8 +285,8 @@ namespace OpenSim.Region.Framework.Scenes
             m_fps = 0;
             m_pfps = 0;
             m_agentUpdates = 0;
-            m_inPacketsPerSecond = 0;
-            m_outPacketsPerSecond = 0;
+            //m_inPacketsPerSecond = 0;
+            //m_outPacketsPerSecond = 0;
             m_unAckedBytes = 0;
             m_scriptLinesPerSecond = 0;
 
@@ -373,12 +373,12 @@ namespace OpenSim.Region.Framework.Scenes
 
         public void AddInPackets(int numPackets)
         {
-            m_inPacketsPerSecond += numPackets;
+            m_inPacketsPerSecond = numPackets;
         }
 
         public void AddOutPackets(int numPackets)
         {
-            m_outPacketsPerSecond += numPackets;
+            m_outPacketsPerSecond = numPackets;
         }
 
         public void AddunAckedBytes(int numBytes)