aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorJustin Clark-Casey (justincc)2009-10-06 20:32:33 +0100
committerJustin Clark-Casey (justincc)2009-10-06 20:32:33 +0100
commit99c85b5ef541b83dc09e93c66232c3893e348e4b (patch)
tree461ef0fdd6640a17db5b3d989f0e02b1cf40252e /OpenSim
parent* Removed verbose debug message (diff)
downloadopensim-SC_OLD-99c85b5ef541b83dc09e93c66232c3893e348e4b.zip
opensim-SC_OLD-99c85b5ef541b83dc09e93c66232c3893e348e4b.tar.gz
opensim-SC_OLD-99c85b5ef541b83dc09e93c66232c3893e348e4b.tar.bz2
opensim-SC_OLD-99c85b5ef541b83dc09e93c66232c3893e348e4b.tar.xz
* 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
Diffstat (limited to 'OpenSim')
-rw-r--r--OpenSim/Framework/ConfigSettings.cs4
-rw-r--r--OpenSim/Framework/InventoryConfig.cs6
-rw-r--r--OpenSim/Tests/Clients/Grid/GridClient.cs2
3 files changed, 6 insertions, 6 deletions
diff --git a/OpenSim/Framework/ConfigSettings.cs b/OpenSim/Framework/ConfigSettings.cs
index 93efffa..32415e0 100644
--- a/OpenSim/Framework/ConfigSettings.cs
+++ b/OpenSim/Framework/ConfigSettings.cs
@@ -168,7 +168,7 @@ namespace OpenSim.Framework
168 public const bool DefaultUserServerHttpSSL = false; 168 public const bool DefaultUserServerHttpSSL = false;
169 public const uint DefaultMessageServerHttpPort = 8006; 169 public const uint DefaultMessageServerHttpPort = 8006;
170 public const bool DefaultMessageServerHttpSSL = false; 170 public const bool DefaultMessageServerHttpSSL = false;
171 public const uint DefaultGridServerHttpPort = 8001; 171 public const uint DefaultGridServerHttpPort = 8003;
172 public const uint DefaultInventoryServerHttpPort = 8004; 172 public const uint DefaultInventoryServerHttpPort = 8003;
173 } 173 }
174} 174}
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index f539d55..dd207ad 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -56,15 +56,15 @@ namespace OpenSim.Framework
56 m_configMember.addConfigurationOption("default_inventory_server", 56 m_configMember.addConfigurationOption("default_inventory_server",
57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
58 "Default Inventory Server URI (this server's external name)", 58 "Default Inventory Server URI (this server's external name)",
59 "http://127.0.0.1:8004", false); 59 "http://127.0.0.1:" + ConfigSettings.DefaultInventoryServerHttpPort, false);
60 m_configMember.addConfigurationOption("default_user_server", 60 m_configMember.addConfigurationOption("default_user_server",
61 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 61 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
62 "Default User Server URI", 62 "Default User Server URI",
63 "http://127.0.0.1:8002", false); 63 "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort, false);
64 m_configMember.addConfigurationOption("default_asset_server", 64 m_configMember.addConfigurationOption("default_asset_server",
65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
66 "Default Asset Server URI", 66 "Default Asset Server URI",
67 "http://127.0.0.1:8003", false); 67 "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort, false);
68 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 68 m_configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
69 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 69 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 70 m_configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
diff --git a/OpenSim/Tests/Clients/Grid/GridClient.cs b/OpenSim/Tests/Clients/Grid/GridClient.cs
index 8798c5e..23d8593 100644
--- a/OpenSim/Tests/Clients/Grid/GridClient.cs
+++ b/OpenSim/Tests/Clients/Grid/GridClient.cs
@@ -55,7 +55,7 @@ namespace OpenSim.Tests.Clients.GridClient
55 new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline"); 55 new PatternLayout("%date [%thread] %-5level %logger [%property{NDC}] - %message%newline");
56 log4net.Config.BasicConfigurator.Configure(consoleAppender); 56 log4net.Config.BasicConfigurator.Configure(consoleAppender);
57 57
58 string serverURI = "http://127.0.0.1:8001"; 58 string serverURI = "http://127.0.0.1:" + ConfigSettings.DefaultGridServerHttpPort;
59 GridServicesConnector m_Connector = new GridServicesConnector(serverURI); 59 GridServicesConnector m_Connector = new GridServicesConnector(serverURI);
60 60
61 GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000); 61 GridRegion r1 = CreateRegion("Test Region 1", 1000, 1000);