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

* Change some more default ports to the robust default of 8003 

* Make these use existing constants rather than hardcoding
* These will probably go away soon anyway once all services are under ROBUST
prioritization
Justin Clark-Casey (justincc) 2009-10-06 20:32:33 +01:00
parent 77b4abaa25
commit 99c85b5ef5
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Framework/ConfigSettings.cs
View File

@ -168,7 +168,7 @@ namespace OpenSim.Framework
public const bool DefaultUserServerHttpSSL = false; public const bool DefaultUserServerHttpSSL = false;
public const uint DefaultMessageServerHttpPort = 8006; public const uint DefaultMessageServerHttpPort = 8006;
public const bool DefaultMessageServerHttpSSL = false; public const bool DefaultMessageServerHttpSSL = false;
public const uint DefaultGridServerHttpPort = 8001; public const uint DefaultGridServerHttpPort = 8003;
public const uint DefaultInventoryServerHttpPort = 8004; public const uint DefaultInventoryServerHttpPort = 8003;
} }
} }

6
OpenSim/Framework/InventoryConfig.cs
View File

@ -56,15 +56,15 @@ 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 (this server's external name)", "Default Inventory Server URI (this server's external name)",
"http://127.0.0.1:8004", false); "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort, false);
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:8002", false); "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort, false);
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:8003", false); "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort, false);
m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
"DLL for database provider", "OpenSim.Data.MySQL.dll", false); "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,

2
OpenSim/Tests/Clients/Grid/GridClient.cs
View File

@ -55,7 +55,7 @@ namespace OpenSim.Tests.Clients.GridClient
new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
log4net.Config.BasicConfigurator.Configure(consoleAppender); log4net.Config.BasicConfigurator.Configure(consoleAppender);
string serverURI = "http://127.0.0.1:8001"; string serverURI = "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort;
GridServicesConnector m_Connector = new GridServicesConnector(serverURI); GridServicesConnector m_Connector = new GridServicesConnector(serverURI);
GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000); GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000);