Merge branch 'master' into careminster

8 files changed, 416 insertions, 38 deletions

diff --git a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
index d84460a..4c9ee06 100644
--- a/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
+++ b/OpenSim/Region/CoreModules/Framework/Monitoring/MonitorModule.cs
@@ -33,6 +33,7 @@ using log4net;
 using Nini.Config;
 using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Framework.Monitoring;
 using OpenSim.Framework.Servers;
 using OpenSim.Region.CoreModules.Framework.Monitoring.Alerts;
 using OpenSim.Region.CoreModules.Framework.Monitoring.Monitors;
@@ -100,6 +101,7 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
                 "/monitorstats/" + Uri.EscapeDataString(m_scene.RegionInfo.RegionName), StatsPage);
 
             AddMonitors();
+            RegisterStatsManagerRegionStatistics();
         }
 
         public void RemoveRegion(Scene scene)
@@ -109,6 +111,9 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
 
             MainServer.Instance.RemoveHTTPHandler("GET", "/monitorstats/" + m_scene.RegionInfo.RegionID);
             MainServer.Instance.RemoveHTTPHandler("GET", "/monitorstats/" + Uri.EscapeDataString(m_scene.RegionInfo.RegionName));
+
+            UnRegisterStatsManagerRegionStatistics();
+
             m_scene = null;
         }
 
@@ -399,6 +404,47 @@ namespace OpenSim.Region.CoreModules.Framework.Monitoring
         {
             m_log.Error("[Monitor] " + reporter.Name + " for " + m_scene.RegionInfo.RegionName + " reports " + reason + " (Fatal: " + fatal + ")");
         }
+
+        private List<Stat> registeredStats = new List<Stat>();
+        private void MakeStat(string pName, string pUnitName, Action<Stat> act)
+        {
+            Stat tempStat = new Stat(pName, pName, pName, pUnitName, "scene", m_scene.RegionInfo.RegionName, StatType.Pull, act, StatVerbosity.Info);
+            StatsManager.RegisterStat(tempStat);
+            registeredStats.Add(tempStat);
+        }
+        private void RegisterStatsManagerRegionStatistics()
+        {
+            string regionName = m_scene.RegionInfo.RegionName;
+
+            MakeStat("RootAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetRootAgentCount(); });
+            MakeStat("ChildAgents", "avatars", (s) => { s.Value = m_scene.SceneGraph.GetChildAgentCount(); });
+            MakeStat("TotalPrims", "objects", (s) => { s.Value = m_scene.SceneGraph.GetTotalObjectsCount(); });
+            MakeStat("ActivePrims", "objects", (s) => { s.Value = m_scene.SceneGraph.GetActiveObjectsCount(); });
+            MakeStat("ActiveScripts", "scripts", (s) => { s.Value = m_scene.SceneGraph.GetActiveScriptsCount(); });
+
+            MakeStat("TimeDilation", "sec/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[0]; });
+            MakeStat("SimFPS", "fps", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[1]; });
+            MakeStat("PhysicsFPS", "fps", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[2]; });
+            MakeStat("AgentUpdates", "updates/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[3]; });
+            MakeStat("FrameTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[8]; });
+            MakeStat("NetTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[9]; });
+            MakeStat("OtherTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[12]; });
+            MakeStat("PhysicsTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[10]; });
+            MakeStat("AgentTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[16]; });
+            MakeStat("ImageTime", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[11]; });
+            MakeStat("ScriptLines", "lines/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[20]; });
+            MakeStat("SimSpareMS", "ms/sec", (s) => { s.Value = m_scene.StatsReporter.LastReportedSimStats[21]; });
+        }
+        
+        private void UnRegisterStatsManagerRegionStatistics()
+        {
+            foreach (Stat stat in registeredStats)
+            {
+                StatsManager.DeregisterStat(stat);
+                stat.Dispose();
+            }
+            registeredStats.Clear();
+        }
         
     }
-}
+}
\ No newline at end of file
diff --git a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
index ec94420..7b11658 100644
--- a/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/Hypergrid/HGWorldMapModule.cs
@@ -52,8 +52,8 @@ namespace OpenSim.Region.CoreModules.Hypergrid
 
         public override void Initialise(IConfigSource config)
         {
-            IConfig startupConfig = config.Configs["Startup"];
-            if (startupConfig.GetString("WorldMapModule", "WorldMap") == "HGWorldMap")
+            if (Util.GetConfigVarFromSections<string>(
+                config, "WorldMapModule", new string[] { "Map", "Startup" }, "WorldMap") == "HGWorldMap")
                 m_Enabled = true;
         }
 
diff --git a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
index e7065dc..40638f8 100644
--- a/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
@@ -80,17 +80,14 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
             bool generateMaptiles = true;
             Bitmap mapbmp;
 
-            try
-            {
-                IConfig startupConfig = m_config.Configs["Startup"];
-                drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume);
-                textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain);
-                generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", generateMaptiles);
-            }
-            catch
-            {
-                m_log.Warn("[MAPTILE]: Failed to load StartupConfig");
-            }
+            string[] configSections = new string[] { "Map", "Startup" };
+
+            drawPrimVolume 
+                = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
+            textureTerrain 
+                = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
+            generateMaptiles 
+                = Util.GetConfigVarFromSections<bool>(m_config, "GenerateMaptiles", configSections, generateMaptiles);
 
             if (generateMaptiles)
             {
@@ -148,9 +145,8 @@ namespace OpenSim.Region.CoreModules.World.LegacyMap
         {
             m_config = source;
 
-            IConfig startupConfig = m_config.Configs["Startup"];
-            if (startupConfig.GetString("MapImageModule", "MapImageModule") !=
-                    "MapImageModule")
+            if (Util.GetConfigVarFromSections<string>(
+                m_config, "MapImageModule", new string[] { "Startup", "Map" }, "MapImageModule") != "MapImageModule")
                 return;
 
             m_Enabled = true;
diff --git a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
index 7ef44db..d38f34b 100644
--- a/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
+++ b/OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
@@ -74,8 +74,8 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
         {
             m_config = source;
 
-            IConfig startupConfig = m_config.Configs["Startup"];
-            if (startupConfig.GetString("MapImageModule", "MapImageModule") != "Warp3DImageModule")
+            if (Util.GetConfigVarFromSections<string>(
+                m_config, "MapImageModule", new string[] { "Startup", "Map" }, "MapImageModule") != "Warp3DImageModule")
                 return;
 
             m_Enabled = true;
@@ -157,16 +157,12 @@ namespace OpenSim.Region.CoreModules.World.Warp3DMap
             bool drawPrimVolume = true;
             bool textureTerrain = true;
 
-            try
-            {
-                IConfig startupConfig = m_config.Configs["Startup"];
-                drawPrimVolume = startupConfig.GetBoolean("DrawPrimOnMapTile", drawPrimVolume);
-                textureTerrain = startupConfig.GetBoolean("TextureOnMapTile", textureTerrain);
-            }
-            catch
-            {
-                m_log.Warn("[WARP 3D IMAGE MODULE]: Failed to load StartupConfig");
-            }
+            string[] configSections = new string[] { "Map", "Startup" };
+
+            drawPrimVolume 
+                = Util.GetConfigVarFromSections<bool>(m_config, "DrawPrimOnMapTile", configSections, drawPrimVolume);
+            textureTerrain 
+                = Util.GetConfigVarFromSections<bool>(m_config, "TextureOnMapTile", configSections, textureTerrain);
 
             m_colors.Clear();
 
diff --git a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
index 2184a59..c868ee4 100644
--- a/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
+++ b/OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
@@ -89,11 +89,14 @@ namespace OpenSim.Region.CoreModules.World.WorldMap
         #region INonSharedRegionModule Members
         public virtual void Initialise (IConfigSource config)
         {
-            IConfig startupConfig = config.Configs["Startup"];
-            if (startupConfig.GetString("WorldMapModule", "WorldMap") == "WorldMap")
+            string[] configSections = new string[] { "Map", "Startup" };
+
+            if (Util.GetConfigVarFromSections<string>(
+                config, "WorldMapModule", configSections, "WorldMap") == "WorldMap")
                 m_Enabled = true;
 
-            blacklistTimeout = startupConfig.GetInt("BlacklistTimeout", 10*60) * 1000;
+            blacklistTimeout 
+                = Util.GetConfigVarFromSections<int>(config, "BlacklistTimeout", configSections, 10 * 60) * 1000;
         }
 
         public virtual void AddRegion (Scene scene)
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index 1a1c3d2..a229a9a 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -921,7 +921,11 @@ namespace OpenSim.Region.Framework.Scenes
                 m_seeIntoBannedRegion = startupConfig.GetBoolean("SeeIntoBannedRegion", m_seeIntoBannedRegion);
                 CombineRegions = startupConfig.GetBoolean("CombineContiguousRegions", false);
 
-                m_generateMaptiles = startupConfig.GetBoolean("GenerateMaptiles", true);
+                string[] possibleMapConfigSections = new string[] { "Map", "Startup" };
+
+                m_generateMaptiles 
+                    = Util.GetConfigVarFromSections<bool>(config, "GenerateMaptiles", possibleMapConfigSections, true);
+
                 if (m_generateMaptiles)
                 {
                     int maptileRefresh = startupConfig.GetInt("MaptileRefresh", 0);
@@ -935,7 +939,10 @@ namespace OpenSim.Region.Framework.Scenes
                 }
                 else
                 {
-                    string tile = startupConfig.GetString("MaptileStaticUUID", UUID.Zero.ToString());
+                    string tile 
+                        = Util.GetConfigVarFromSections<string>(
+                            config, "MaptileStaticUUID", possibleMapConfigSections, UUID.Zero.ToString());
+
                     UUID tileID;
 
                     if (tile != UUID.Zero.ToString() && UUID.TryParse(tile, out tileID))
diff --git a/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs b/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs
new file mode 100644
index 0000000..a3d2436
--- /dev/null
+++ b/OpenSim/Region/OptionalModules/Framework/Monitoring/ServerStats.cs
@@ -0,0 +1,328 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the OpenSimulator Project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using System.Net.NetworkInformation;
+using System.Text;
+using System.Threading;
+
+using log4net;
+using Mono.Addins;
+using Nini.Config;
+
+using OpenSim.Framework;
+using OpenSim.Framework.Console;
+using OpenSim.Framework.Monitoring;
+using OpenSim.Region.Framework.Interfaces;
+using OpenSim.Region.Framework.Scenes;
+
+using OpenMetaverse.StructuredData;
+
+namespace OpenSim.Region.OptionalModules.Framework.Monitoring
+{
+[Extension(Path = "/OpenSim/RegionModules", NodeName = "RegionModule", Id = "ServerStatistics")]
+public class ServerStats : ISharedRegionModule
+{
+    private readonly ILog m_log = LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
+    private readonly string LogHeader = "[SERVER STATS]";
+
+    public bool Enabled = false;
+    private static Dictionary<string, Stat> RegisteredStats = new Dictionary<string, Stat>();
+
+    public readonly string CategoryServer = "server";
+
+    public readonly string ContainerProcessor = "processor";
+    public readonly string ContainerMemory = "memory";
+    public readonly string ContainerNetwork = "network";
+    public readonly string ContainerProcess = "process";
+
+    public string NetworkInterfaceTypes = "Ethernet";
+
+    readonly int performanceCounterSampleInterval = 500;
+    int lastperformanceCounterSampleTime = 0;
+
+    private class PerfCounterControl
+    {
+        public PerformanceCounter perfCounter;
+        public int lastFetch;
+        public string name;
+        public PerfCounterControl(PerformanceCounter pPc)
+            : this(pPc, String.Empty)
+        {
+        }
+        public PerfCounterControl(PerformanceCounter pPc, string pName)
+        {
+            perfCounter = pPc;
+            lastFetch = 0;
+            name = pName;
+        }
+    }
+
+    PerfCounterControl processorPercentPerfCounter = null;
+
+    #region ISharedRegionModule
+    // IRegionModuleBase.Name
+    public string Name { get { return "Server Stats"; } }
+    // IRegionModuleBase.ReplaceableInterface
+    public Type ReplaceableInterface { get { return null; } }
+    // IRegionModuleBase.Initialize
+    public void Initialise(IConfigSource source)
+    {
+        IConfig cfg = source.Configs["Monitoring"];
+
+        if (cfg != null)
+            Enabled = cfg.GetBoolean("ServerStatsEnabled", true);
+
+        if (Enabled)
+        {
+            NetworkInterfaceTypes = cfg.GetString("NetworkInterfaceTypes", "Ethernet");
+        }
+    }
+    // IRegionModuleBase.Close
+    public void Close()
+    {
+        if (RegisteredStats.Count > 0)
+        {
+            foreach (Stat stat in RegisteredStats.Values)
+            {
+                StatsManager.DeregisterStat(stat);
+                stat.Dispose();
+            }
+            RegisteredStats.Clear();
+        }
+    }
+    // IRegionModuleBase.AddRegion
+    public void AddRegion(Scene scene)
+    {
+    }
+    // IRegionModuleBase.RemoveRegion
+    public void RemoveRegion(Scene scene)
+    {
+    }
+    // IRegionModuleBase.RegionLoaded
+    public void RegionLoaded(Scene scene)
+    {
+    }
+    // ISharedRegionModule.PostInitialize
+    public void PostInitialise()
+    {
+        if (RegisteredStats.Count == 0)
+        {
+            RegisterServerStats();
+        }
+    }
+    #endregion ISharedRegionModule
+
+    private void MakeStat(string pName, string pUnit, string pContainer, Action<Stat> act)
+    {
+        Stat stat = new Stat(pName, pName, "", pUnit, CategoryServer, pContainer, StatType.Pull, act, StatVerbosity.Info);
+        StatsManager.RegisterStat(stat);
+        RegisteredStats.Add(pName, stat);
+    }
+
+    public void RegisterServerStats()
+    {
+        lastperformanceCounterSampleTime = Util.EnvironmentTickCount();
+        PerformanceCounter tempPC;
+        Stat tempStat;
+        string tempName;
+
+        try
+        {
+            tempName = "CPUPercent";
+            tempPC = new PerformanceCounter("Processor", "% Processor Time", "_Total");
+            processorPercentPerfCounter = new PerfCounterControl(tempPC);
+            // A long time bug in mono is that CPU percent is reported as CPU percent idle. Windows reports CPU percent busy.
+            tempStat = new Stat(tempName, tempName, "", "percent", CategoryServer, ContainerProcessor,
+                            StatType.Pull, (s) => { GetNextValue(s, processorPercentPerfCounter, Util.IsWindows() ? 1 : -1); },
+                            StatVerbosity.Info);
+            StatsManager.RegisterStat(tempStat);
+            RegisteredStats.Add(tempName, tempStat);
+
+            MakeStat("TotalProcessorTime", "sec", ContainerProcessor, 
+                                (s) => { s.Value = Process.GetCurrentProcess().TotalProcessorTime.TotalSeconds; });
+
+            MakeStat("UserProcessorTime", "sec", ContainerProcessor,
+                                (s) => { s.Value = Process.GetCurrentProcess().UserProcessorTime.TotalSeconds; });
+
+            MakeStat("PrivilegedProcessorTime", "sec", ContainerProcessor,
+                                (s) => { s.Value = Process.GetCurrentProcess().PrivilegedProcessorTime.TotalSeconds; });
+
+            MakeStat("Threads", "threads", ContainerProcessor,
+                                (s) => { s.Value = Process.GetCurrentProcess().Threads.Count; });
+        }
+        catch (Exception e)
+        {
+            m_log.ErrorFormat("{0} Exception creating 'Process': {1}", LogHeader, e);
+        }
+
+        try
+        {
+            List<string> okInterfaceTypes = new List<string>(NetworkInterfaceTypes.Split(','));
+
+            IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces();
+            foreach (NetworkInterface nic in nics)
+            {
+                if (nic.OperationalStatus != OperationalStatus.Up)
+                    continue;
+
+                string nicInterfaceType = nic.NetworkInterfaceType.ToString();
+                if (!okInterfaceTypes.Contains(nicInterfaceType))
+                {
+                    m_log.DebugFormat("{0} Not including stats for network interface '{1}' of type '{2}'. To include, add to [Monitoring]NetworkInterfaceTypes='Ethernet,Loopback'",
+                                            LogHeader, nic.Name, nicInterfaceType);
+                    continue;
+                }
+
+                if (nic.Supports(NetworkInterfaceComponent.IPv4))
+                {
+                    IPv4InterfaceStatistics nicStats = nic.GetIPv4Statistics();
+                    if (nicStats != null)
+                    {
+                        MakeStat("BytesRcvd/" + nic.Name, "KB", ContainerNetwork,
+                                        (s) => { LookupNic(s, (ns) => { return ns.BytesReceived; }, 1024.0); });
+                        MakeStat("BytesSent/" + nic.Name, "KB", ContainerNetwork,
+                                        (s) => { LookupNic(s, (ns) => { return ns.BytesSent; }, 1024.0); });
+                        MakeStat("TotalBytes/" + nic.Name, "KB", ContainerNetwork,
+                                        (s) => { LookupNic(s, (ns) => { return ns.BytesSent + ns.BytesReceived; }, 1024.0); });
+                    }
+                }
+            }
+        }
+        catch (Exception e)
+        {
+            m_log.ErrorFormat("{0} Exception creating 'Network Interface': {1}", LogHeader, e);
+        }
+
+        MakeStat("ProcessMemory", "MB", ContainerMemory,
+                            (s) => { s.Value = Process.GetCurrentProcess().WorkingSet64 / 1024d / 1024d; });
+        MakeStat("ObjectMemory", "MB", ContainerMemory,
+                            (s) => { s.Value = GC.GetTotalMemory(false) / 1024d / 1024d; });
+        MakeStat("LastMemoryChurn", "MB/sec", ContainerMemory,
+                            (s) => { s.Value = Math.Round(MemoryWatchdog.LastMemoryChurn * 1000d / 1024d / 1024d, 3); });
+        MakeStat("AverageMemoryChurn", "MB/sec", ContainerMemory,
+                            (s) => { s.Value = Math.Round(MemoryWatchdog.AverageMemoryChurn * 1000d / 1024d / 1024d, 3); });
+    }
+
+    // Notes on performance counters: 
+    //  "How To Read Performance Counters": http://blogs.msdn.com/b/bclteam/archive/2006/06/02/618156.aspx
+    //  "How to get the CPU Usage in C#": http://stackoverflow.com/questions/278071/how-to-get-the-cpu-usage-in-c
+    //  "Mono Performance Counters": http://www.mono-project.com/Mono_Performance_Counters
+    private delegate double PerfCounterNextValue();
+    private void GetNextValue(Stat stat, PerfCounterControl perfControl)
+    {
+        GetNextValue(stat, perfControl, 1.0);
+    }
+    private void GetNextValue(Stat stat, PerfCounterControl perfControl, double factor)
+    {
+        if (Util.EnvironmentTickCountSubtract(perfControl.lastFetch) > performanceCounterSampleInterval)
+        {
+            if (perfControl != null && perfControl.perfCounter != null)
+            {
+                try
+                {
+                    // Kludge for factor to run double duty. If -1, subtract the value from one
+                    if (factor == -1)
+                        stat.Value = 1 - perfControl.perfCounter.NextValue();
+                    else
+                        stat.Value = perfControl.perfCounter.NextValue() / factor;
+                }
+                catch (Exception e)
+                {
+                    m_log.ErrorFormat("{0} Exception on NextValue fetching {1}: {2}", LogHeader, stat.Name, e);
+                }
+                perfControl.lastFetch = Util.EnvironmentTickCount();
+            }
+        }
+    }
+
+    private delegate double GetIPv4StatValue(IPv4InterfaceStatistics interfaceStat);
+    private void LookupNic(Stat stat, GetIPv4StatValue getter, double factor)
+    {
+        // Get the one nic that has the name of this stat
+        IEnumerable<NetworkInterface> nics = NetworkInterface.GetAllNetworkInterfaces().Where(
+                              (network) => network.Name == stat.Description);
+        try
+        {
+            foreach (NetworkInterface nic in nics)
+            {
+                IPv4InterfaceStatistics intrStats = nic.GetIPv4Statistics();
+                if (intrStats != null)
+                    stat.Value = Math.Round(getter(intrStats) / factor, 3);
+                break;
+            }
+        }
+        catch
+        {
+            // There are times interfaces go away so we just won't update the stat for this
+            m_log.ErrorFormat("{0} Exception fetching stat on interface '{1}'", LogHeader, stat.Description);
+        }
+    }
+}
+
+public class ServerStatsAggregator : Stat
+{
+    public ServerStatsAggregator(
+        string shortName,
+        string name,
+        string description,
+        string unitName,
+        string category,
+        string container
+        )
+        : base(
+            shortName,
+            name,
+            description,
+            unitName,
+            category,
+            container,
+            StatType.Push,
+            MeasuresOfInterest.None,
+            null,
+            StatVerbosity.Info)
+    {
+    }
+    public override string ToConsoleString()
+    {
+        StringBuilder sb = new StringBuilder();
+
+        return sb.ToString();
+    }
+
+    public override OSDMap ToOSDMap()
+    {
+        OSDMap ret = new OSDMap();
+
+        return ret;
+    }
+}
+
+}
diff --git a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
index 1f186c3..f442ca2 100644
--- a/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
+++ b/OpenSim/Region/Physics/BulletSPlugin/BSCharacter.cs
@@ -204,7 +204,7 @@ public sealed class BSCharacter : BSPhysObject
             //   move. Thus, the velocity cannot be forced to zero. The problem is that small velocity
             //   errors can creap in and the avatar will slowly float off in some direction.
             // So, the problem is that, when an avatar is standing, we cannot tell creaping error
-            //   from real pushing.OMV.Vector3.Zero;
+            //   from real pushing.
             // The code below keeps setting the velocity to zero hoping the world will keep pushing.
 
             _velocityMotor.Step(timeStep);
@@ -254,9 +254,11 @@ public sealed class BSCharacter : BSPhysObject
                 }
 
                 // If falling, we keep the world's downward vector no matter what the other axis specify.
+                // The check for _velocity.Z < 0 makes jumping work (temporary upward force).
                 if (!Flying && !IsColliding)
                 {
-                    stepVelocity.Z = _velocity.Z;
+                    if (_velocity.Z < 0)
+                        stepVelocity.Z = _velocity.Z;
                     // DetailLog("{0},BSCharacter.MoveMotor,taint,overrideStepZWithWorldZ,stepVel={1}", LocalID, stepVelocity);
                 }
 
@@ -512,7 +514,7 @@ public sealed class BSCharacter : BSPhysObject
             //    just assign to "Position" because of potential call loops.
             PhysicsScene.TaintedObject(inTaintTime, "BSCharacter.PositionSanityCheck", delegate()
             {
-                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);

+                DetailLog("{0},BSCharacter.PositionSanityCheck,taint,pos={1},orient={2}", LocalID, _position, _orientation);
                 ForcePosition = _position;
             });
             ret = true;
@@ -572,7 +574,7 @@ public sealed class BSCharacter : BSPhysObject
             m_targetVelocity = value;
             OMV.Vector3 targetVel = value;
             if (_setAlwaysRun)
-                targetVel *= BSParam.AvatarAlwaysRunFactor;
+                targetVel *= new OMV.Vector3(BSParam.AvatarAlwaysRunFactor, BSParam.AvatarAlwaysRunFactor, 0f);
 
             PhysicsScene.TaintedObject("BSCharacter.setTargetVelocity", delegate()
             {