aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/GridConfig.cs
diff options
context:
space:
mode:
authorTeravus Ovares2007-12-20 06:31:03 +0000
committerTeravus Ovares2007-12-20 06:31:03 +0000
commit8aae9094128069b83fbf11cb77503e29fd381b25 (patch)
tree96515c224150272c435c6b004d0950fcd4f07509 /OpenSim/Framework/GridConfig.cs
parentAdded patch from Johan. First attempt to solve the LibSL.Packet GC problem. W... (diff)
downloadopensim-SC_OLD-8aae9094128069b83fbf11cb77503e29fd381b25.zip
opensim-SC_OLD-8aae9094128069b83fbf11cb77503e29fd381b25.tar.gz
opensim-SC_OLD-8aae9094128069b83fbf11cb77503e29fd381b25.tar.bz2
opensim-SC_OLD-8aae9094128069b83fbf11cb77503e29fd381b25.tar.xz
* 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.
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r--OpenSim/Framework/GridConfig.cs9
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
44 44
45 public string DatabaseProvider = ""; 45 public string DatabaseProvider = "";
46 46
47
47 public static uint DefaultHttpPort = 8001; 48 public static uint DefaultHttpPort = 8001;
48 public uint HttpPort = DefaultHttpPort; 49 public uint HttpPort = DefaultHttpPort;
49 50
51 public string AllowForcefulBanlines = "TRUE";
52
50 private ConfigurationMember configMember; 53 private ConfigurationMember configMember;
51 54
52 public GridConfig(string description, string filename) 55 public GridConfig(string description, string filename)
@@ -89,6 +92,9 @@ namespace OpenSim.Framework
89 92
90 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 93 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
91 "Http Listener port", DefaultHttpPort.ToString(), false); 94 "Http Listener port", DefaultHttpPort.ToString(), false);
95
96 configMember.addConfigurationOption("allow_forceful_banlines", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
97 "Allow Forceful Banlines", "TRUE", true);
92 } 98 }
93 99
94 public bool handleIncomingConfiguration(string configuration_key, object configuration_result) 100 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
@@ -128,6 +134,9 @@ namespace OpenSim.Framework
128 case "http_port": 134 case "http_port":
129 HttpPort = (uint) configuration_result; 135 HttpPort = (uint) configuration_result;
130 break; 136 break;
137 case "allow_forceful_banlines":
138 AllowForcefulBanlines = (string)configuration_result;
139 break;
131 } 140 }
132 141
133 return true; 142 return true;