diff options
author | Brian McBee | 2007-11-25 21:21:44 +0000 |
---|---|---|
committer | Brian McBee | 2007-11-25 21:21:44 +0000 |
commit | 35472b36663fba7528358daa65e029d41ecde206 (patch) | |
tree | da3918b4217e738734f09445234e52d48da6f034 /OpenSim/Framework | |
parent | Rez new prims ON the ground, not halfway buried. Mantis 33. (diff) | |
download | opensim-SC-35472b36663fba7528358daa65e029d41ecde206.zip opensim-SC-35472b36663fba7528358daa65e029d41ecde206.tar.gz opensim-SC-35472b36663fba7528358daa65e029d41ecde206.tar.bz2 opensim-SC-35472b36663fba7528358daa65e029d41ecde206.tar.xz |
Added new configuration item to User Server: X and Y of region to send user to if their logon region is down. Known good region, sort of.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r-- | OpenSim/Framework/UserConfig.cs | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs index fdb8f82..d4ee62f 100644 --- a/OpenSim/Framework/UserConfig.cs +++ b/OpenSim/Framework/UserConfig.cs | |||
@@ -42,6 +42,8 @@ namespace OpenSim.Framework | |||
42 | 42 | ||
43 | public static uint DefaultHttpPort = 8002; | 43 | public static uint DefaultHttpPort = 8002; |
44 | public uint HttpPort = DefaultHttpPort; | 44 | public uint HttpPort = DefaultHttpPort; |
45 | public uint DefaultX = 1000; | ||
46 | public uint DefaultY = 1000; | ||
45 | 47 | ||
46 | private ConfigurationMember configMember; | 48 | private ConfigurationMember configMember; |
47 | 49 | ||
@@ -71,6 +73,10 @@ namespace OpenSim.Framework | |||
71 | 73 | ||
72 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 74 | configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
73 | "Http Listener port", DefaultHttpPort.ToString(), false); | 75 | "Http Listener port", DefaultHttpPort.ToString(), false); |
76 | configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | ||
77 | "Known good region X", "1000", false); | ||
78 | configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | ||
79 | "Known good region Y", "1000", false); | ||
74 | } | 80 | } |
75 | 81 | ||
76 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) | 82 | public bool handleIncomingConfiguration(string configuration_key, object configuration_result) |
@@ -95,6 +101,12 @@ namespace OpenSim.Framework | |||
95 | case "http_port": | 101 | case "http_port": |
96 | HttpPort = (uint) configuration_result; | 102 | HttpPort = (uint) configuration_result; |
97 | break; | 103 | break; |
104 | case "default_X": | ||
105 | DefaultX = (uint)configuration_result; | ||
106 | break; | ||
107 | case "default_Y": | ||
108 | DefaultY = (uint)configuration_result; | ||
109 | break; | ||
98 | } | 110 | } |
99 | 111 | ||
100 | return true; | 112 | return true; |