aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-08-09 21:01:33 +0000
committerJustin Clarke Casey2008-08-09 21:01:33 +0000
commit6630706dd9507c216a88de66dca8d4439c03ac49 (patch)
tree86e977e38c43bebc8f7fc6450f2f03123554dd5c /OpenSim/Framework
parent* minor: oops, forgot the code that actually ends up eliminating the unused c... (diff)
downloadopensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.zip
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.gz
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.bz2
opensim-SC_OLD-6630706dd9507c216a88de66dca8d4439c03ac49.tar.xz
* Reinstate grid receive and send keys to user server config
* Looks like these weren't so unused after all - oops! * Remove message from grid server config
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/GridConfig.cs7
-rw-r--r--OpenSim/Framework/UserConfig.cs12
2 files changed, 12 insertions, 7 deletions
diff --git a/OpenSim/Framework/GridConfig.cs b/OpenSim/Framework/GridConfig.cs
index e405b26..889f345 100644
--- a/OpenSim/Framework/GridConfig.cs
+++ b/OpenSim/Framework/GridConfig.cs
@@ -42,7 +42,6 @@ namespace OpenSim.Framework
42 public string DatabaseConnect = String.Empty; 42 public string DatabaseConnect = String.Empty;
43 public string DefaultAssetServer = String.Empty; 43 public string DefaultAssetServer = String.Empty;
44 public string DefaultUserServer = String.Empty; 44 public string DefaultUserServer = String.Empty;
45 public string GridOwner = String.Empty;
46 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultHttpPort;
47 public string SimRecvKey = String.Empty; 46 public string SimRecvKey = String.Empty;
48 public string SimSendKey = String.Empty; 47 public string SimSendKey = String.Empty;
@@ -58,9 +57,6 @@ namespace OpenSim.Framework
58 57
59 public void loadConfigurationOptions() 58 public void loadConfigurationOptions()
60 { 59 {
61 configMember.addConfigurationOption("grid_owner",
62 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
63 "OGS Grid Owner", "OGS development team", false);
64 configMember.addConfigurationOption("default_asset_server", 60 configMember.addConfigurationOption("default_asset_server",
65 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 61 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
66 "Default Asset Server URI", 62 "Default Asset Server URI",
@@ -101,9 +97,6 @@ namespace OpenSim.Framework
101 { 97 {
102 switch (configuration_key) 98 switch (configuration_key)
103 { 99 {
104 case "grid_owner":
105 GridOwner = (string) configuration_result;
106 break;
107 case "default_asset_server": 100 case "default_asset_server":
108 DefaultAssetServer = (string) configuration_result; 101 DefaultAssetServer = (string) configuration_result;
109 break; 102 break;
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index cb3365f..6cf526c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,6 +42,8 @@ namespace OpenSim.Framework
42 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
43 public uint DefaultX = 1000; 43 public uint DefaultX = 1000;
44 public uint DefaultY = 1000; 44 public uint DefaultY = 1000;
45 public string GridRecvKey = String.Empty;
46 public string GridSendKey = String.Empty;
45 public uint HttpPort = DefaultHttpPort; 47 public uint HttpPort = DefaultHttpPort;
46 public bool HttpSSL = DefaultHttpSSL; 48 public bool HttpSSL = DefaultHttpSSL;
47 49
@@ -96,6 +98,10 @@ namespace OpenSim.Framework
96 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 98 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
97 "Default Grid Server URI", 99 "Default Grid Server URI",
98 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false); 100 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false);
101 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
102 "Key to send to grid server", "null", false);
103 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
104 "Key to expect from grid server", "null", false);
99 105
100 configMember.addConfigurationOption("default_inventory_server", 106 configMember.addConfigurationOption("default_inventory_server",
101 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 107 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -129,6 +135,12 @@ namespace OpenSim.Framework
129 case "default_grid_server": 135 case "default_grid_server":
130 GridServerURL = new Uri( (string) configuration_result ); 136 GridServerURL = new Uri( (string) configuration_result );
131 break; 137 break;
138 case "grid_send_key":
139 GridSendKey = (string) configuration_result;
140 break;
141 case "grid_recv_key":
142 GridRecvKey = (string) configuration_result;
143 break;
132 case "default_inventory_server": 144 case "default_inventory_server":
133 InventoryUrl = new Uri((string) configuration_result); 145 InventoryUrl = new Uri((string) configuration_result);
134 break; 146 break;