diff options
Diffstat (limited to 'OpenSim/Framework/GridConfig.cs')
-rw-r--r-- | OpenSim/Framework/GridConfig.cs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs index 679c84b..b24c81f 100644 --- a/OpenSim/Framework/GridConfig.cs +++ b/OpenSim/Framework/GridConfig.cs | |||
@@ -40,7 +40,7 @@ namespace OpenSim.Framework | |||
40 | public string DatabaseConnect = String.Empty; | 40 | public string DatabaseConnect = String.Empty; |
41 | public string DefaultAssetServer = String.Empty; | 41 | public string DefaultAssetServer = String.Empty; |
42 | public string DefaultUserServer = String.Empty; | 42 | public string DefaultUserServer = String.Empty; |
43 | public uint HttpPort = DefaultSettings.DefaultGridServerHttpPort; | 43 | public uint HttpPort = ConfigSettings.DefaultGridServerHttpPort; |
44 | public string SimRecvKey = String.Empty; | 44 | public string SimRecvKey = String.Empty; |
45 | public string SimSendKey = String.Empty; | 45 | public string SimSendKey = String.Empty; |
46 | public string UserRecvKey = String.Empty; | 46 | public string UserRecvKey = String.Empty; |
@@ -58,7 +58,7 @@ namespace OpenSim.Framework | |||
58 | m_configMember.addConfigurationOption("default_asset_server", | 58 | m_configMember.addConfigurationOption("default_asset_server", |
59 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 59 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
60 | "Default Asset Server URI", | 60 | "Default Asset Server URI", |
61 | "http://127.0.0.1:" + DefaultSettings.DefaultAssetServerHttpPort.ToString() + "/", | 61 | "http://127.0.0.1:" + ConfigSettings.DefaultAssetServerHttpPort.ToString() + "/", |
62 | false); | 62 | false); |
63 | m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 63 | m_configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
64 | "Key to send to asset server", "null", false); | 64 | "Key to send to asset server", "null", false); |
@@ -68,7 +68,7 @@ namespace OpenSim.Framework | |||
68 | m_configMember.addConfigurationOption("default_user_server", | 68 | m_configMember.addConfigurationOption("default_user_server", |
69 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, | 69 | ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, |
70 | "Default User Server URI", | 70 | "Default User Server URI", |
71 | "http://127.0.0.1:" + DefaultSettings.DefaultUserServerHttpPort.ToString() + "/", false); | 71 | "http://127.0.0.1:" + ConfigSettings.DefaultUserServerHttpPort.ToString() + "/", false); |
72 | m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 72 | m_configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
73 | "Key to send to user server", "null", false); | 73 | "Key to send to user server", "null", false); |
74 | m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 74 | m_configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, |
@@ -84,7 +84,7 @@ namespace OpenSim.Framework | |||
84 | "Database connect string", "", false); | 84 | "Database connect string", "", false); |
85 | 85 | ||
86 | m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, | 86 | m_configMember.addConfigurationOption("http_port", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, |
87 | "Http Listener port", DefaultSettings.DefaultGridServerHttpPort.ToString(), false); | 87 | "Http Listener port", ConfigSettings.DefaultGridServerHttpPort.ToString(), false); |
88 | 88 | ||
89 | m_configMember.addConfigurationOption("allow_forceful_banlines", | 89 | m_configMember.addConfigurationOption("allow_forceful_banlines", |
90 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, | 90 | ConfigurationOption.ConfigurationTypes.TYPE_STRING, |