Merge branch 'master' of /home/opensim/var/repo/opensim

OpenSim/Framework/Monitoring/MemoryWatchdog.cs

@@ -89,7 +89,7 @@ namespace OpenSim.Framework.Monitoring
         /// <summary>
         /// Memory churn rate per millisecond.
         /// </summary>
-        private static double m_churnRatePerMillisecond;
+//        private static double m_churnRatePerMillisecond;
 
         /// <summary>
         /// Historical samples for calculating moving average.

OpenSim/Region/Framework/Interfaces/IScenePresence.cs

@@ -40,8 +40,6 @@ namespace OpenSim.Region.Framework.Interfaces
     /// </remarks>
     public interface IScenePresence : ISceneAgent
     {
-        PresenceType PresenceType { get; }
-
         /// <summary>
         /// Copy of the script states while the agent is in transit. This state may
         /// need to be placed back in case of transfer fail.