diff options
author | Justin Clarke Casey | 2008-10-13 20:35:45 +0000 |
---|---|---|
committer | Justin Clarke Casey | 2008-10-13 20:35:45 +0000 |
commit | 97f4226666b5d3525999550e1362180be182cc87 (patch) | |
tree | eb0a19c238f42bf34960f28f92c1c4c1b75aa374 /OpenSim/Framework | |
parent | Update svn properties. (diff) | |
download | opensim-SC-97f4226666b5d3525999550e1362180be182cc87.zip opensim-SC-97f4226666b5d3525999550e1362180be182cc87.tar.gz opensim-SC-97f4226666b5d3525999550e1362180be182cc87.tar.bz2 opensim-SC-97f4226666b5d3525999550e1362180be182cc87.tar.xz |
* Apply a modified version of the part of http://opensimulator.org/mantis/view.php?id=2361 that allows region registration to be enabled/disabled on the grid server
* Region registration is enabled by default in the configuration unless the user chooses otherwise
* On the console
* show status - shows grid status
* enable-reg - enables region registration to the grid
* disable-reg - disables region registration
* Enabling or disabling region registration will not affect any other grid functions or regions already on the grid
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/EstateSettings.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 12 | ||||
-rw-r--r-- | OpenSim/Framework/PacketPool.cs | 2 | ||||
-rw-r--r-- | OpenSim/Framework/RegionSettings.cs | 2 |
4 files changed, 14 insertions, 4 deletions
diff --git a/OpenSim/Framework/EstateSettings.cs b/OpenSim/Framework/EstateSettings.cs index b7dccdb..f8595e0 100644 --- a/OpenSim/Framework/EstateSettings.cs +++ b/OpenSim/Framework/EstateSettings.cs | |||
@@ -290,7 +290,7 @@ namespace OpenSim.Framework | |||
290 | l_EstateManagers.Clear(); | 290 | l_EstateManagers.Clear(); |
291 | configMember.performConfigurationRetrieve(); | 291 | configMember.performConfigurationRetrieve(); |
292 | } | 292 | } |
293 | catch (Exception e) | 293 | catch (Exception) |
294 | { | 294 | { |
295 | } | 295 | } |
296 | } | 296 | } |
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 889f345..52bc3d6 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -34,6 +34,7 @@ namespace OpenSim.Framework | |||
34 | public static uint DefaultHttpPort = 8001; | 34 | public static uint DefaultHttpPort = 8001; |
35 | 35 | ||
36 | public string AllowForcefulBanlines = "TRUE"; | 36 | public string AllowForcefulBanlines = "TRUE"; |
37 | public bool AllowRegionRegistration = true; | ||
37 | public string AssetRecvKey = String.Empty; | 38 | public string AssetRecvKey = String.Empty; |
38 | public string AssetSendKey = String.Empty; | 39 | public string AssetSendKey = String.Empty; |
39 | 40 | ||
@@ -90,7 +91,13 @@ namespace OpenSim.Framework | |||
90 | 91 | ||
91 | configMember.addConfigurationOption("allow_forceful_banlines", | 92 | configMember.addConfigurationOption("allow_forceful_banlines", |
92 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 93 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
93 | "Allow Forceful Banlines", "TRUE", true); | 94 | "Allow Forceful Banlines", "TRUE", true); |
95 | |||
96 | configMember.addConfigurationOption("allow_region_registration", | ||
97 | ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, | ||
98 | "Allow regions to register immediately upon grid server startup? true/false", | ||
99 | "True", | ||
100 | false); | ||
94 | } | 101 | } |
95 | 102 | ||
96 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 103 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -133,6 +140,9 @@ namespace OpenSim.Framework | |||
133 | case "allow_forceful_banlines": | 140 | case "allow_forceful_banlines": |
134 | AllowForcefulBanlines = (string) configuration_result; | 141 | AllowForcefulBanlines = (string) configuration_result; |
135 | break; | 142 | break; |
143 | case "allow_region_registration": | ||
144 | AllowRegionRegistration = (bool)configuration_result; | ||
145 | break; | ||
136 | } | 146 | } |
137 | 147 | ||
138 | return true; | 148 | return true; |
diff --git a/OpenSim/Framework/PacketPool.cs b/OpenSim/Framework/PacketPool.cs index 807403e..e24da42 100644 --- a/OpenSim/Framework/PacketPool.cs +++ b/OpenSim/Framework/PacketPool.cs | |||
@@ -36,7 +36,7 @@ namespace OpenSim.Framework | |||
36 | { | 36 | { |
37 | private static readonly PacketPool instance = new PacketPool(); | 37 | private static readonly PacketPool instance = new PacketPool(); |
38 | 38 | ||
39 | private const bool packetPoolEnabled = false; | 39 | private bool packetPoolEnabled = false; |
40 | 40 | ||
41 | private readonly Dictionary<PacketType, Stack<Packet>> pool = new Dictionary<PacketType, Stack<Packet>>(); | 41 | private readonly Dictionary<PacketType, Stack<Packet>> pool = new Dictionary<PacketType, Stack<Packet>>(); |
42 | 42 | ||
diff --git a/OpenSim/Framework/RegionSettings.cs b/OpenSim/Framework/RegionSettings.cs index 6281d6c..ba04513 100644 --- a/OpenSim/Framework/RegionSettings.cs +++ b/OpenSim/Framework/RegionSettings.cs | |||
@@ -50,7 +50,7 @@ namespace OpenSim.Framework | |||
50 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); | 50 | configMember = new ConfigurationMember(Path.Combine(Util.configDir(), "estate_settings.xml"), "ESTATE SETTINGS", LoadConfigurationOptions, HandleIncomingConfiguration, true); |
51 | configMember.performConfigurationRetrieve(); | 51 | configMember.performConfigurationRetrieve(); |
52 | } | 52 | } |
53 | catch (Exception e) | 53 | catch (Exception) |
54 | { | 54 | { |
55 | } | 55 | } |
56 | } | 56 | } |