aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
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
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 '')
-rw-r--r--OpenSim/Framework/Communications/GridInfoService.cs12
-rw-r--r--OpenSim/Framework/NetworkServersInfo.cs4
-rw-r--r--OpenSim/Framework/Servers/BaseHttpServer.cs2
3 files changed, 11 insertions, 7 deletions
diff --git a/OpenSim/Framework/Communications/GridInfoService.cs b/OpenSim/Framework/Communications/GridInfoService.cs
index 488ce8e..bb54c1b 100644
--- a/OpenSim/Framework/Communications/GridInfoService.cs
+++ b/OpenSim/Framework/Communications/GridInfoService.cs
@@ -102,9 +102,15 @@ namespace OpenSim.Framework.Communications
102 else if (null != netCfg) 102 else if (null != netCfg)
103 { 103 {
104 if (grid) 104 if (grid)
105 _info["login"] = netCfg.GetString("user_server_url"); 105 _info["login"]
106 else 106 = netCfg.GetString(
107 _info["login"] = String.Format("http://127.0.0.1:{0}/", netCfg.GetString("http_listener_port")); 107 "user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
108 else
109 _info["login"]
110 = String.Format(
111 "http://127.0.0.1:{0}/",
112 netCfg.GetString("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort));
113
108 IssueWarning(); 114 IssueWarning();
109 } 115 }
110 else 116 else
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 =
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 16bfbd8..5bd0fa5 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
115 { 115 {
116 string httpMethod = handler.HttpMethod; 116 string httpMethod = handler.HttpMethod;
117 string path = handler.Path; 117 string path = handler.Path;
118
119 string handlerKey = GetHandlerKey(httpMethod, path); 118 string handlerKey = GetHandlerKey(httpMethod, path);
120 119
121 lock (m_streamHandlers) 120 lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
187 // Note that the agent string is provided simply to differentiate 186 // Note that the agent string is provided simply to differentiate
188 // the handlers - it is NOT required to be an actual agent header 187 // the handlers - it is NOT required to be an actual agent header
189 // value. 188 // value.
190
191 public bool AddAgentHandler(string agent, IHttpAgentHandler handler) 189 public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
192 { 190 {
193 lock (m_agentHandlers) 191 lock (m_agentHandlers)