* Added a configuration parameter on the Grid Server to disallow forceful banlists.

* Added a way for Grid based configuration parameters to (generally used in overriding functionality) to get to the regions on Registration.

2 files changed, 48 insertions, 1 deletions

diff --git a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
index f57de1c..f6137f7 100644
--- a/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
+++ b/OpenSim/Region/Communications/Local/LocalBackEndServices.cs
@@ -43,6 +43,8 @@ namespace OpenSim.Region.Communications.Local
 
         private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
 
+        private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
+
         public string _gdebugRegionName = "";
 
         public string gdebugRegionName
@@ -218,6 +220,26 @@ namespace OpenSim.Region.Communications.Local
             return false;
         }
 
+        // This function Is only here to keep this class in line with the Grid Interface.
+        // It never gets called.
+        public virtual Dictionary<string, string> GetGridSettings()
+        {
+            Dictionary<string,string> returnGridSettings = new Dictionary<string,string>();
+            lock (m_queuedGridSettings)
+            {
+                returnGridSettings = m_queuedGridSettings;
+                m_queuedGridSettings.Clear();
+            }
+
+            return returnGridSettings;
+        }
+
+        public virtual void SetForcefulBanlistsDisallowed(ulong regionHandle)
+        {
+            m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
+
+        }
+
         public bool TriggerRegionUp(RegionInfo region, ulong regionhandle)
         {
             if (m_regionListeners.ContainsKey(regionhandle))
diff --git a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
index 060fe28..7adac58 100644
--- a/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
+++ b/OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Region.Communications.OGS1
         private LocalBackEndServices m_localBackend = new LocalBackEndServices();
         private Dictionary<ulong, RegionInfo> m_remoteRegionInfoCache = new Dictionary<ulong, RegionInfo>();
         private List<SimpleRegionInfo> m_knownRegions = new List<SimpleRegionInfo>();
+        private Dictionary<string, string> m_queuedGridSettings = new Dictionary<string, string>();
 
         public BaseHttpServer httpListener;
         public NetworkServersInfo serversInfo;
@@ -134,7 +135,15 @@ namespace OpenSim.Region.Communications.OGS1
             else
             {
                 m_knownRegions = RequestNeighbours(regionInfo.RegionLocX, regionInfo.RegionLocY);
-                
+                if (GridRespData.ContainsKey("allow_forceful_banlines"))
+                {
+
+                    if ((string)GridRespData["allow_forceful_banlines"] != "TRUE")
+                    {
+                        //m_localBackend.SetForcefulBanlistsDisallowed(regionInfo.RegionHandle);
+                        m_queuedGridSettings.Add("allow_forceful_banlines", "FALSE");
+                    }
+                }
                 
             }
             return m_localBackend.RegisterRegion(regionInfo);
@@ -144,7 +153,23 @@ namespace OpenSim.Region.Communications.OGS1
         {
             return false;
         }
+        public virtual Dictionary<string, string> GetGridSettings()
+        {
+            Dictionary<string, string> returnGridSettings = new Dictionary<string, string>();
+            lock (m_queuedGridSettings)
+            {
+                foreach (string Dictkey in m_queuedGridSettings.Keys)
+                {
+                    returnGridSettings.Add(Dictkey, m_queuedGridSettings[Dictkey]);
+
+                }
 
+                
+                m_queuedGridSettings.Clear();
+            }
+
+            return returnGridSettings;
+        }
         /// <summary>
         /// 
         /// </summary>