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

4 files changed, 17 insertions, 1 deletions

diff --git a/OpenSim/Framework/Communications/IGridServices.cs b/OpenSim/Framework/Communications/IGridServices.cs
index 240d9c0..d51f234 100644
--- a/OpenSim/Framework/Communications/IGridServices.cs
+++ b/OpenSim/Framework/Communications/IGridServices.cs
@@ -25,7 +25,7 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
-
+using System.Collections;
 using System.Collections.Generic;
 
 namespace OpenSim.Framework.Communications
@@ -37,6 +37,7 @@ namespace OpenSim.Framework.Communications
         bool DeregisterRegion(RegionInfo regionInfo);
         List<SimpleRegionInfo> RequestNeighbours(uint x, uint y);
         RegionInfo RequestNeighbourInfo(ulong regionHandle);
+        Dictionary<string, string> GetGridSettings();
         List<MapBlockData> RequestNeighbourMapBlocks(int minX, int minY, int maxX, int maxY);
         
     }
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;
diff --git a/OpenSim/Framework/IRegionCommsListener.cs b/OpenSim/Framework/IRegionCommsListener.cs
index 7aaeffe..363ab27 100644
--- a/OpenSim/Framework/IRegionCommsListener.cs
+++ b/OpenSim/Framework/IRegionCommsListener.cs
@@ -50,6 +50,7 @@ namespace OpenSim.Framework
 
     public delegate bool ChildAgentUpdate(ulong regionHandle, ChildAgentDataUpdate cAgentData);
 
+
     
 
     public interface IRegionCommsListener
diff --git a/OpenSim/Framework/RegionCommsListener.cs b/OpenSim/Framework/RegionCommsListener.cs
index e8752ac..a146778 100644
--- a/OpenSim/Framework/RegionCommsListener.cs
+++ b/OpenSim/Framework/RegionCommsListener.cs
@@ -44,6 +44,8 @@ namespace OpenSim.Framework
         public event CloseAgentConnection OnCloseAgentConnection;
         public event RegionUp OnRegionUp;
         public event ChildAgentUpdate OnChildAgentUpdate;
+        
+
         public string debugRegionName="";
         
 
@@ -62,6 +64,9 @@ namespace OpenSim.Framework
 
             return false;
         }
+
+
+
         public virtual bool TriggerExpectPrim(ulong regionHandle, LLUUID primID, string objData)
         {
             if (OnExpectUser != null)