Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim

2 files changed, 32 insertions, 17 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Prioritizer.cs b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
index af25014..e6a4642 100644
--- a/OpenSim/Region/Framework/Scenes/Prioritizer.cs
+++ b/OpenSim/Region/Framework/Scenes/Prioritizer.cs
@@ -5,6 +5,18 @@ using Nini.Config;
 using OpenSim.Framework;
 using OpenMetaverse;
 
+/*
+ * Steps to add a new prioritization policy:
+ * 
+ *  - Add a new value to the UpdatePrioritizationSchemes enum.
+ *  - Specify this new value in the [InterestManagement] section of your
+ *    OpenSim.ini. The name in the config file must match the enum value name
+ *    (although it is not case sensitive).
+ *  - Write a new GetPriorityBy*() method in this class.
+ *  - Add a new entry to the switch statement in GetUpdatePriority() that calls
+ *    your method.
+ */
+
 namespace OpenSim.Region.Framework.Scenes
 {
     public enum UpdatePrioritizationSchemes
@@ -35,7 +47,7 @@ namespace OpenSim.Region.Framework.Scenes
                 case UpdatePrioritizationSchemes.Distance:
                     return GetPriorityByDistance(client, entity);
                 case UpdatePrioritizationSchemes.SimpleAngularDistance:
-                    return GetPriorityByDistance(client, entity);
+                    return GetPriorityByDistance(client, entity); // TODO: Reimplement SimpleAngularDistance
                 case UpdatePrioritizationSchemes.FrontBack:
                     return GetPriorityByFrontBack(client, entity);
                 default:
diff --git a/OpenSim/Region/Framework/Scenes/Scene.cs b/OpenSim/Region/Framework/Scenes/Scene.cs
index f35dffc..46fbcd3 100644
--- a/OpenSim/Region/Framework/Scenes/Scene.cs
+++ b/OpenSim/Region/Framework/Scenes/Scene.cs
@@ -794,25 +794,28 @@ namespace OpenSim.Region.Framework.Scenes
 
             #region Interest Management
 
-            IConfig interestConfig = m_config.Configs["InterestManagement"];
-            if (interestConfig != null)
+            if (m_config != null)
             {
-                string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
-
-                try
+                IConfig interestConfig = m_config.Configs["InterestManagement"];
+                if (interestConfig != null)
                 {
-                    m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
-                }
-                catch (Exception)
-                {
-                    m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
-                    m_priorityScheme = UpdatePrioritizationSchemes.Time;
-                }
+                    string update_prioritization_scheme = interestConfig.GetString("UpdatePrioritizationScheme", "Time").Trim().ToLower();
 
-                m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
-                m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
-                m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
-                m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
+                    try
+                    {
+                        m_priorityScheme = (UpdatePrioritizationSchemes)Enum.Parse(typeof(UpdatePrioritizationSchemes), update_prioritization_scheme, true);
+                    }
+                    catch (Exception)
+                    {
+                        m_log.Warn("[PRIORITIZER]: UpdatePrioritizationScheme was not recognized, setting to default prioritizer Time");
+                        m_priorityScheme = UpdatePrioritizationSchemes.Time;
+                    }
+
+                    m_reprioritizationEnabled = interestConfig.GetBoolean("ReprioritizationEnabled", true);
+                    m_reprioritizationInterval = interestConfig.GetDouble("ReprioritizationInterval", 5000.0);
+                    m_rootReprioritizationDistance = interestConfig.GetDouble("RootReprioritizationDistance", 10.0);
+                    m_childReprioritizationDistance = interestConfig.GetDouble("ChildReprioritizationDistance", 20.0);
+                }
             }
 
             m_log.Info("[SCENE]: Using the " + m_priorityScheme + " prioritization scheme");