OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Moved the DefaultConfig settings into already-existing ConfigSettings

0.6.5-rc1
lbsa71 2009-04-17 15:09:37 +00:00
parent 1759d05cdf
commit a189da844a
15 changed files with 59 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/AssetConfig.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Framework
{ {
public string DatabaseConnect = String.Empty; public string DatabaseConnect = String.Empty;
public string DatabaseProvider = String.Empty; public string DatabaseProvider = String.Empty;
public uint HttpPort = DefaultSettings.DefaultAssetServerHttpPort; public uint HttpPort = ConfigSettings.DefaultAssetServerHttpPort;
public string AssetSetsLocation = string.Empty; public string AssetSetsLocation = string.Empty;
public AssetConfig(string description, string filename) public AssetConfig(string description, string filename)
@ -56,7 +56,7 @@ namespace OpenSim.Framework
"Database connection string", "", false); "Database connection string", "", false);
m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultSettings.DefaultAssetServerHttpPort.ToString(), false); "Http Listener port", ConfigSettings.DefaultAssetServerHttpPort.ToString(), false);
m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("assetset_location", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Location of 'AssetSets.xml'", "Location of 'AssetSets.xml'",

4
OpenSim/Framework/Communications/Services/GridInfoService.cs
View File

@ -104,13 +104,13 @@ namespace OpenSim.Framework.Communications.Services
if (grid) if (grid)
_info["login"] _info["login"]
= netCfg.GetString( = netCfg.GetString(
"user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
else else
_info["login"] _info["login"]
= String.Format( = String.Format(
"http://127.0.0.1:{0}/", "http://127.0.0.1:{0}/",
netCfg.GetString( netCfg.GetString(
"http_listener_port", DefaultSettings.DefaultRegionHttpPort.ToString())); "http_listener_port", ConfigSettings.DefaultRegionHttpPort.ToString()));
IssueWarning(); IssueWarning();
} }

10
OpenSim/Framework/ConfigSettings.cs
View File

@ -212,5 +212,15 @@ namespace OpenSim.Framework
m_assetSetsXMLFile = value; m_assetSetsXMLFile = value;
} }
} }
public const uint DefaultAssetServerHttpPort = 8003;
public const uint DefaultRegionHttpPort = 9000;
public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
public const uint DefaultUserServerHttpPort = 8002;
public const bool DefaultUserServerHttpSSL = false;
public const uint DefaultMessageServerHttpPort = 8006;
public const bool DefaultMessageServerHttpSSL = false;
public const uint DefaultGridServerHttpPort = 8001;
public const uint DefaultInventoryServerHttpPort = 8004;
} }
} }

19
OpenSim/Framework/DefaultSettings.cs
View File

@ -1,19 +0,0 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace OpenSim.Framework
{
public static class DefaultSettings
{
public const uint DefaultAssetServerHttpPort = 8003;
public const uint DefaultRegionHttpPort = 9000;
public static uint DefaultRegionRemotingPort = 8895; // This is actually assigned to, but then again, the remoting is obsolete, right?
public const uint DefaultUserServerHttpPort = 8002;
public const bool DefaultUserServerHttpSSL = false;
public const uint DefaultMessageServerHttpPort = 8006;
public const bool DefaultMessageServerHttpSSL = false;
public const uint DefaultGridServerHttpPort = 8001;
public const uint DefaultInventoryServerHttpPort = 8004;
}
}

8
OpenSim/Framework/GridConfig.cs
View File

@ -40,7 +40,7 @@ namespace OpenSim.Framework
public string DatabaseConnect = String.Empty; public string DatabaseConnect = String.Empty;
public string DefaultAssetServer = String.Empty; public string DefaultAssetServer = String.Empty;
public string DefaultUserServer = String.Empty; public string DefaultUserServer = String.Empty;
public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort; public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort;
public string SimRecvKey = String.Empty; public string SimRecvKey = String.Empty;
public string SimSendKey = String.Empty; public string SimSendKey = String.Empty;
public string UserRecvKey = String.Empty; public string UserRecvKey = String.Empty;
@ -58,7 +58,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_asset_server", m_configMember.addConfigurationOption("default_asset_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Asset Server URI", "Default Asset Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/",
false); false);
m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to asset server", "null", false); "Key to send to asset server", "null", false);
@ -68,7 +68,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_user_server", m_configMember.addConfigurationOption("default_user_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default User Server URI", "Default User Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to user server", "null", false); "Key to send to user server", "null", false);
m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@ -84,7 +84,7 @@ namespace OpenSim.Framework
"Database connect string", "", false); "Database connect string", "", false);
m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false); "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false);
m_configMember.addConfigurationOption("allow_forceful_banlines", m_configMember.addConfigurationOption("allow_forceful_banlines",
ConfigurationOption.ConfigurationTypes.TYPE_STRING, ConfigurationOption.ConfigurationTypes.TYPE_STRING,

4
OpenSim/Framework/InventoryConfig.cs
View File

@ -37,7 +37,7 @@ namespace OpenSim.Framework
public string DatabaseConnect = String.Empty; public string DatabaseConnect = String.Empty;
public string DatabaseProvider = String.Empty; public string DatabaseProvider = String.Empty;
public string DefaultStartupMsg = String.Empty; public string DefaultStartupMsg = String.Empty;
public uint HttpPort = DefaultSettings.DefaultInventoryServerHttpPort; public uint HttpPort = ConfigSettings.DefaultInventoryServerHttpPort;
public string InventoryServerURL = String.Empty; public string InventoryServerURL = String.Empty;
public string UserServerURL = String.Empty; public string UserServerURL = String.Empty;
public string AssetServerURL = String.Empty; public string AssetServerURL = String.Empty;
@ -70,7 +70,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Database Connect String", "", false); "Database Connect String", "", false);
m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultSettings.DefaultInventoryServerHttpPort.ToString(), false); "Http Listener port", ConfigSettings.DefaultInventoryServerHttpPort.ToString(), false);
m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, m_configMember.addConfigurationOption("session_lookup", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Enable session lookup security", "False", false); "Enable session lookup security", "False", false);
m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, m_configMember.addConfigurationOption("region_access", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,

12
OpenSim/Framework/MessageServerConfig.cs
View File

@ -40,8 +40,8 @@ namespace OpenSim.Framework
public string GridRecvKey = String.Empty; public string GridRecvKey = String.Empty;
public string GridSendKey = String.Empty; public string GridSendKey = String.Empty;
public string GridServerURL = String.Empty; public string GridServerURL = String.Empty;
public uint HttpPort = DefaultSettings.DefaultMessageServerHttpPort; public uint HttpPort = ConfigSettings.DefaultMessageServerHttpPort;
public bool HttpSSL = DefaultSettings.DefaultMessageServerHttpSSL; public bool HttpSSL = ConfigSettings.DefaultMessageServerHttpSSL;
public string MessageServerIP = String.Empty; public string MessageServerIP = String.Empty;
public string UserRecvKey = String.Empty; public string UserRecvKey = String.Empty;
public string UserSendKey = String.Empty; public string UserSendKey = String.Empty;
@ -59,7 +59,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_user_server", m_configMember.addConfigurationOption("default_user_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default User Server URI", "Default User Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false);
m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to user server", "null", false); "Key to send to user server", "null", false);
m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@ -67,7 +67,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_grid_server", m_configMember.addConfigurationOption("default_grid_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Grid Server URI", "Default Grid Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString() + "/", false); "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString() + "/", false);
m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to grid server", "null", false); "Key to send to grid server", "null", false);
m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@ -83,9 +83,9 @@ namespace OpenSim.Framework
"DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false); "DLL for comms provider", "OpenSim.Region.Communications.OGS1.dll", false);
m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultSettings.DefaultMessageServerHttpPort.ToString(), false); "Http Listener port", ConfigSettings.DefaultMessageServerHttpPort.ToString(), false);
m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Use SSL? true/false", DefaultSettings.DefaultMessageServerHttpSSL.ToString(), false); "Use SSL? true/false", ConfigSettings.DefaultMessageServerHttpSSL.ToString(), false);
m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("published_ip", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"My Published IP Address", "127.0.0.1", false); "My Published IP Address", "127.0.0.1", false);
} }

20
OpenSim/Framework/NetworkServersInfo.cs
View File

@ -33,12 +33,12 @@ namespace OpenSim.Framework
public class NetworkServersInfo public class NetworkServersInfo
{ {
public string AssetSendKey = String.Empty; public string AssetSendKey = String.Empty;
public string AssetURL = "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/"; public string AssetURL = "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/";
public string GridRecvKey = String.Empty; public string GridRecvKey = String.Empty;
public string GridSendKey = String.Empty; public string GridSendKey = String.Empty;
public string GridURL = String.Empty; public string GridURL = String.Empty;
public uint HttpListenerPort = DefaultSettings.DefaultRegionHttpPort; public uint HttpListenerPort = ConfigSettings.DefaultRegionHttpPort;
public string InventoryURL = String.Empty; public string InventoryURL = String.Empty;
public bool secureInventoryServer = false; public bool secureInventoryServer = false;
public bool isSandbox; public bool isSandbox;
@ -79,31 +79,31 @@ namespace OpenSim.Framework
m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000); m_defaultHomeLocY = (uint) config.Configs["StandAlone"].GetInt("default_location_y", 1000);
HttpListenerPort = HttpListenerPort =
(uint) config.Configs["Network"].GetInt("http_listener_port", (int) DefaultSettings.DefaultRegionHttpPort); (uint) config.Configs["Network"].GetInt("http_listener_port", (int) ConfigSettings.DefaultRegionHttpPort);
httpSSLPort = httpSSLPort =
(uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)DefaultSettings.DefaultRegionHttpPort+1)); (uint)config.Configs["Network"].GetInt("http_listener_sslport", ((int)ConfigSettings.DefaultRegionHttpPort+1));
HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false); HttpUsesSSL = config.Configs["Network"].GetBoolean("http_listener_ssl", false);
HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost"); HttpSSLCN = config.Configs["Network"].GetString("http_listener_cn", "localhost");
DefaultSettings.DefaultRegionRemotingPort = ConfigSettings.DefaultRegionRemotingPort =
(uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) DefaultSettings.DefaultRegionRemotingPort); (uint) config.Configs["Network"].GetInt("remoting_listener_port", (int) ConfigSettings.DefaultRegionRemotingPort);
GridURL = GridURL =
config.Configs["Network"].GetString("grid_server_url", config.Configs["Network"].GetString("grid_server_url",
"http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null"); GridSendKey = config.Configs["Network"].GetString("grid_send_key", "null");
GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null"); GridRecvKey = config.Configs["Network"].GetString("grid_recv_key", "null");
UserURL = UserURL =
config.Configs["Network"].GetString("user_server_url", config.Configs["Network"].GetString("user_server_url",
"http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
UserSendKey = config.Configs["Network"].GetString("user_send_key", "null"); UserSendKey = config.Configs["Network"].GetString("user_send_key", "null");
UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null"); UserRecvKey = config.Configs["Network"].GetString("user_recv_key", "null");
AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL); AssetURL = config.Configs["Network"].GetString("asset_server_url", AssetURL);
InventoryURL = config.Configs["Network"].GetString("inventory_server_url", InventoryURL = config.Configs["Network"].GetString("inventory_server_url",
"http://127.0.0.1:" + "http://127.0.0.1:" +
DefaultSettings.DefaultInventoryServerHttpPort.ToString()); ConfigSettings.DefaultInventoryServerHttpPort.ToString());
secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true); secureInventoryServer = config.Configs["Network"].GetBoolean("secure_inventory_server", true);
MessagingURL = config.Configs["Network"].GetString("messaging_server_url", MessagingURL = config.Configs["Network"].GetString("messaging_server_url",
"http://127.0.0.1:" + DefaultSettings.DefaultMessageServerHttpPort); "http://127.0.0.1:" + ConfigSettings.DefaultMessageServerHttpPort);
} }
} }
} }

4
OpenSim/Framework/RegionInfo.cs
View File

@ -366,7 +366,7 @@ namespace OpenSim.Framework
errorMessage = "needs an IP Address (IPAddress)"; errorMessage = "needs an IP Address (IPAddress)";
} }
m_internalEndPoint.Port = m_internalEndPoint.Port =
source.Configs[sectionName].GetInt("internal_ip_port", (int) DefaultSettings.DefaultRegionHttpPort); source.Configs[sectionName].GetInt("internal_ip_port", (int) ConfigSettings.DefaultRegionHttpPort);
string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1"); string externalHost = source.Configs[sectionName].GetString("external_host_name", "127.0.0.1");
if (externalHost != "SYSTEMIP") if (externalHost != "SYSTEMIP")
@ -475,7 +475,7 @@ namespace OpenSim.Framework
false); false);
configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32, configMember.addConfigurationOption("internal_ip_port", ConfigurationOption.ConfigurationTypes.TYPE_INT32,
"Internal IP Port for incoming UDP client connections", "Internal IP Port for incoming UDP client connections",
DefaultSettings.DefaultRegionHttpPort.ToString(), false); ConfigSettings.DefaultRegionHttpPort.ToString(), false);
configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, configMember.addConfigurationOption("allow_alternate_ports", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Allow sim to find alternate UDP ports when ports are in use?", "Allow sim to find alternate UDP ports when ports are in use?",
"false", true); "false", true);

14
OpenSim/Framework/UserConfig.cs
View File

@ -42,8 +42,8 @@ namespace OpenSim.Framework
public uint DefaultY = 1000; public uint DefaultY = 1000;
public string GridRecvKey = String.Empty; public string GridRecvKey = String.Empty;
public string GridSendKey = String.Empty; public string GridSendKey = String.Empty;
public uint HttpPort = DefaultSettings.DefaultUserServerHttpPort; public uint HttpPort = ConfigSettings.DefaultUserServerHttpPort;
public bool HttpSSL = DefaultSettings.DefaultUserServerHttpSSL; public bool HttpSSL = ConfigSettings.DefaultUserServerHttpSSL;
public uint DefaultUserLevel = 0; public uint DefaultUserLevel = 0;
public string LibraryXmlfile = ""; public string LibraryXmlfile = "";
@ -112,7 +112,7 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_grid_server", m_configMember.addConfigurationOption("default_grid_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Grid Server URI", "Default Grid Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort + "/", false); "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort + "/", false);
m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"Key to send to grid server", "null", false); "Key to send to grid server", "null", false);
m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@ -121,12 +121,12 @@ namespace OpenSim.Framework
m_configMember.addConfigurationOption("default_inventory_server", m_configMember.addConfigurationOption("default_inventory_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"Default Inventory Server URI", "Default Inventory Server URI",
"http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort + "/", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort + "/",
false); false);
m_configMember.addConfigurationOption("default_authentication_server", m_configMember.addConfigurationOption("default_authentication_server",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
"User Server (this) External URI for authentication keys", "User Server (this) External URI for authentication keys",
"http://localhost:" + DefaultSettings.DefaultUserServerHttpPort + "/", "http://localhost:" + ConfigSettings.DefaultUserServerHttpPort + "/",
false); false);
m_configMember.addConfigurationOption("library_location", m_configMember.addConfigurationOption("library_location",
ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@ -139,9 +139,9 @@ namespace OpenSim.Framework
"Connection String for Database", "", false); "Connection String for Database", "", false);
m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Http Listener port", DefaultSettings.DefaultUserServerHttpPort.ToString(), false); "Http Listener port", ConfigSettings.DefaultUserServerHttpPort.ToString(), false);
m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, m_configMember.addConfigurationOption("http_ssl", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
"Use SSL? true/false", DefaultSettings.DefaultUserServerHttpSSL.ToString(), false); "Use SSL? true/false", ConfigSettings.DefaultUserServerHttpSSL.ToString(), false);
m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("default_X", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
"Known good region X", "1000", false); "Known good region X", "1000", false);
m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, m_configMember.addConfigurationOption("default_Y", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,

12
OpenSim/Region/Application/ConfigurationLoader.cs
View File

@ -252,16 +252,16 @@ namespace OpenSim
config.Set("default_location_x", 1000); config.Set("default_location_x", 1000);
config.Set("default_location_y", 1000); config.Set("default_location_y", 1000);
config.Set("http_listener_port", DefaultSettings.DefaultRegionHttpPort); config.Set("http_listener_port", ConfigSettings.DefaultRegionHttpPort);
config.Set("remoting_listener_port", DefaultSettings.DefaultRegionRemotingPort); config.Set("remoting_listener_port", ConfigSettings.DefaultRegionRemotingPort);
config.Set("grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString()); config.Set("grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString());
config.Set("grid_send_key", "null"); config.Set("grid_send_key", "null");
config.Set("grid_recv_key", "null"); config.Set("grid_recv_key", "null");
config.Set("user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); config.Set("user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
config.Set("user_send_key", "null"); config.Set("user_send_key", "null");
config.Set("user_recv_key", "null"); config.Set("user_recv_key", "null");
config.Set("asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString()); config.Set("asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString());
config.Set("inventory_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultInventoryServerHttpPort.ToString()); config.Set("inventory_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort.ToString());
config.Set("secure_inventory_server", "true"); config.Set("secure_inventory_server", "true");
} }

4
OpenSim/Region/Communications/Hypergrid/HGGridServices.cs
View File

@ -552,7 +552,7 @@ namespace OpenSim.Region.Communications.Hypergrid
hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString(); hash["region_image"] = regInfo.RegionSettings.TerrainImageID.ToString();
hash["region_name"] = regInfo.RegionName; hash["region_name"] = regInfo.RegionName;
hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString(); hash["internal_port"] = regInfo.InternalEndPoint.Port.ToString();
hash["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); hash["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
//m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port); //m_log.Debug(">> Here: " + regInfo.InternalEndPoint.Port);
@ -640,7 +640,7 @@ namespace OpenSim.Region.Communications.Hypergrid
m_log.Debug(" >> " + loginParams["home_address"] + " <<"); m_log.Debug(" >> " + loginParams["home_address"] + " <<");
m_log.Debug(" --------- ------------ -------"); m_log.Debug(" --------- ------------ -------");
loginParams["home_port"] = rinfo.HttpPort.ToString(); loginParams["home_port"] = rinfo.HttpPort.ToString();
loginParams["home_remoting"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); ; loginParams["home_remoting"] = ConfigSettings.DefaultRegionRemotingPort.ToString(); ;
} }
} }
else else

2
OpenSim/Region/Communications/OGS1/OGS1GridServices.cs
View File

@ -119,7 +119,7 @@ namespace OpenSim.Region.Communications.OGS1
GridParams["region_locy"] = regionInfo.RegionLocY.ToString(); GridParams["region_locy"] = regionInfo.RegionLocY.ToString();
GridParams["sim_name"] = regionInfo.RegionName; GridParams["sim_name"] = regionInfo.RegionName;
GridParams["http_port"] = serversInfo.HttpListenerPort.ToString(); GridParams["http_port"] = serversInfo.HttpListenerPort.ToString();
GridParams["remoting_port"] = DefaultSettings.DefaultRegionRemotingPort.ToString(); GridParams["remoting_port"] = ConfigSettings.DefaultRegionRemotingPort.ToString();
GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString(); GridParams["map-image-id"] = regionInfo.RegionSettings.TerrainImageID.ToString();
GridParams["originUUID"] = regionInfo.originRegionID.ToString(); GridParams["originUUID"] = regionInfo.originRegionID.ToString();
GridParams["server_uri"] = regionInfo.ServerURI; GridParams["server_uri"] = regionInfo.ServerURI;

8
OpenSim/Region/DataSnapshot/DataSnapshotManager.cs
View File

@ -64,7 +64,7 @@ namespace OpenSim.Region.DataSnapshot
//DataServices and networking //DataServices and networking
private string m_dataServices = "noservices"; private string m_dataServices = "noservices";
public string m_listener_port = DefaultSettings.DefaultRegionHttpPort.ToString(); public string m_listener_port = ConfigSettings.DefaultRegionHttpPort.ToString();
public string m_hostname = "127.0.0.1"; public string m_hostname = "127.0.0.1";
//Update timers //Update timers
@ -106,15 +106,15 @@ namespace OpenSim.Region.DataSnapshot
m_gridinfo.Add( m_gridinfo.Add(
"gridserverURL", "gridserverURL",
config.Configs["Network"].GetString( config.Configs["Network"].GetString(
"grid_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultGridServerHttpPort.ToString())); "grid_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort.ToString()));
m_gridinfo.Add( m_gridinfo.Add(
"userserverURL", "userserverURL",
config.Configs["Network"].GetString( config.Configs["Network"].GetString(
"user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString())); "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString()));
m_gridinfo.Add( m_gridinfo.Add(
"assetserverURL", "assetserverURL",
config.Configs["Network"].GetString( config.Configs["Network"].GetString(
"asset_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString())); "asset_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString()));
} }
m_gridinfo.Add( m_gridinfo.Add(

2
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
View File

@ -8808,7 +8808,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
{ {
shard shard
= config.Configs["Network"].GetString( = config.Configs["Network"].GetString(
"user_server_url", "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString()); "user_server_url", "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString());
shard = config.Configs["Network"].GetString("shard", shard); shard = config.Configs["Network"].GetString("shard", shard);
} }