ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 17:05:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

* Make all coded defaults match settings in OpenSim.ini.example

Browse Source 
* 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)
This commit is contained in:
Justin Clarke Casey
2009-03-11 18:02:22 +00:00
parent 5a6e502266
commit acad0328b2
17 changed files with 133 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Framework/Communications/GridInfoService.cs
View File

@@ -102,9 +102,15 @@ namespace OpenSim.Framework.Communications
else if (null != netCfg)
{
if (grid)
_info["login"] = netCfg.GetString("user_server_url");
else
_info["login"] = String.Format("http://127.0.0.1:{0}/", netCfg.GetString("http_listener_port"));
_info["login"]
= netCfg.GetString(
"user_server_url", "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString());
else
_info["login"]
= String.Format(
"http://127.0.0.1:{0}/",
netCfg.GetString("http_listener_port", NetworkServersInfo.DefaultHttpListenerPort));
IssueWarning();
}
else

4
OpenSim/Framework/NetworkServersInfo.cs
View File

@@ -34,7 +34,7 @@ namespace OpenSim.Framework
{
public static readonly uint DefaultHttpListenerPort = 9000;
public static uint RemotingListenerPort = 8895;
public string AssetSendKey = String.Empty;
public string AssetSendKey = String.Empty;
public string AssetURL = "http://127.0.0.1:" + AssetConfig.DefaultHttpPort.ToString() + "/";
public string GridRecvKey = String.Empty;
@@ -85,7 +85,7 @@ namespace OpenSim.Framework
httpSSLPort =
(uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultHttpListenerPort+1));
HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "");
HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
RemotingListenerPort =
(uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) RemotingListenerPort);
GridURL =

2
OpenSim/Framework/Servers/BaseHttpServer.cs
View File

@@ -115,7 +115,6 @@ namespace OpenSim.Framework.Servers
{
string httpMethod = handler.HttpMethod;
string path = handler.Path;
string handlerKey = GetHandlerKey(httpMethod, path);
lock (m_streamHandlers)
@@ -187,7 +186,6 @@ namespace OpenSim.Framework.Servers
// Note that the agent string is provided simply to differentiate
// the handlers - it is NOT required to be an actual agent header
// value.
public bool AddAgentHandler(string agent, IHttpAgentHandler handler)
{
lock (m_agentHandlers)