* 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.

1 files changed, 9 insertions, 0 deletions

diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index 021e6c5..799be46 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -44,9 +44,12 @@ namespace OpenSim.Framework
 
         public string DatabaseProvider = "";
 
+
         public static uint DefaultHttpPort = 8001;
         public uint HttpPort = DefaultHttpPort;
 
+        public string AllowForcefulBanlines = "TRUE";
+
         private ConfigurationMember configMember;
 
         public GridConfig(string description, string filename)
@@ -89,6 +92,9 @@ namespace OpenSim.Framework
 
             configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
                                                 "Http Listener port", DefaultHttpPort.ToString(), false);
+
+            configMember.addConfigurationOption("allow_forceful_banlines", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 
+                                                "Allow Forceful Banlines", "TRUE", true);
         }
 
         public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -128,6 +134,9 @@ namespace OpenSim.Framework
                 case "http_port":
                     HttpPort = (uint) configuration_result;
                     break;
+                case "allow_forceful_banlines":
+                    AllowForcefulBanlines = (string)configuration_result;
+                    break;
             }
 
             return true;