aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/NetworkServersInfo.cs
diff options
context:
space:
mode:
authorJustin Clarke Casey2009-03-11 18:02:22 +0000
committerJustin Clarke Casey2009-03-11 18:02:22 +0000
commitacad0328b2c50d22fe76ebb7c8de2c97c856b42f (patch)
tree2379c1ae60c22a4dcee162c5b56d21f367c05bfd /OpenSim/Framework/NetworkServersInfo.cs
parent* Fix silly windows prebuild borkage. To use System.Xml, the project must ha... (diff)
downloadopensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.zip
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.gz
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.bz2
opensim-SC_OLD-acad0328b2c50d22fe76ebb7c8de2c97c856b42f.tar.xz
* Make all coded defaults match settings in OpenSim.ini.example
* In most cases, the setting in OpenSim.ini.example is taken as the canonical one since this is the file virtually everyone ends up using * OpenSim will start up with a blank OpenSim.ini, in which case sqlite is the default database (as before)
Diffstat (limited to 'OpenSim/Framework/NetworkServersInfo.cs')
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Framework/NetworkServersInfo.cs b/OpenSim/Framework/NetworkServersInfo.cs
index 49b8ef9..23b1627 100644
--- a/OpenSim/Framework/NetworkServersInfo.cs
+++ b/OpenSim/Framework/NetworkServersInfo.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework
34 { 34 {
35 public static readonly uint DefaultHttpListenerPort = 9000; 35 public static readonly uint DefaultHttpListenerPort = 9000;
36 public static uint RemotingListenerPort = 8895; 36 public static uint RemotingListenerPort = 8895;
37 public string AssetSendKey = String.Empty; 37 public string AssetSendKey = String.Empty;
38 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/"; 38 public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
39 39
40 public string GridRecvKey = String.Empty; 40 public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
85 httpSSLPort = 85 httpSSLPort =
86 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1)); 86 (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
87 HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); 87 HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
88 HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", ""); 88 HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
89 RemotingListenerPort = 89 RemotingListenerPort =
90 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort); 90 (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
91 GridURL = 91 GridURL =