aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/UserConfig.cs
diff options
context:
space:
mode:
authorAdam Frisby2007-12-04 05:47:51 +0000
committerAdam Frisby2007-12-04 05:47:51 +0000
commit7d5f03220384092ed2cb8a86d489e0151774f496 (patch)
tree2f1ba749891a828d32d3959aa7a5877314b2f051 /OpenSim/Framework/UserConfig.cs
parent* Flying with ODE and got that sinking feeling? This should help (diff)
downloadopensim-SC_OLD-7d5f03220384092ed2cb8a86d489e0151774f496.zip
opensim-SC_OLD-7d5f03220384092ed2cb8a86d489e0151774f496.tar.gz
opensim-SC_OLD-7d5f03220384092ed2cb8a86d489e0151774f496.tar.bz2
opensim-SC_OLD-7d5f03220384092ed2cb8a86d489e0151774f496.tar.xz
* Added SSL Support to HttpListener
* Added SSL Option to User Server to allow logins to be done via SSL. * Added sane handling for when Remote Admin Plugin configuration is not found * Added some performance boosts to an area of libTerrain which was highlighted in profiling.
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/UserConfig.cs7
1 files changed, 7 insertions, 0 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 4c6b3b8..1cc00c7 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -43,7 +43,9 @@ namespace OpenSim.Framework
43 public string DatabaseProvider = ""; 43 public string DatabaseProvider = "";
44 44
45 public static uint DefaultHttpPort = 8002; 45 public static uint DefaultHttpPort = 8002;
46 public static bool DefaultHttpSSL = false;
46 public uint HttpPort = DefaultHttpPort; 47 public uint HttpPort = DefaultHttpPort;
48 public bool HttpSSL = DefaultHttpSSL;
47 public uint DefaultX = 1000; 49 public uint DefaultX = 1000;
48 public uint DefaultY = 1000; 50 public uint DefaultY = 1000;
49 51
@@ -80,6 +82,8 @@ namespace OpenSim.Framework
80 82
81 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 83 configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
82 "Http Listener port", DefaultHttpPort.ToString(), false); 84 "Http Listener port", DefaultHttpPort.ToString(), false);
85 configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
86 "Use SSL? true/false", DefaultHttpSSL.ToString(), false);
83 configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 87 configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
84 "Known good region X", "1000", false); 88 "Known good region X", "1000", false);
85 configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 89 configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
@@ -111,6 +115,9 @@ namespace OpenSim.Framework
111 case "http_port": 115 case "http_port":
112 HttpPort = (uint) configuration_result; 116 HttpPort = (uint) configuration_result;
113 break; 117 break;
118 case "http_ssl":
119 HttpSSL = (bool)configuration_result;
120 break;
114 case "default_X": 121 case "default_X":
115 DefaultX = (uint)configuration_result; 122 DefaultX = (uint)configuration_result;
116 break; 123 break;