aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/UserConfig.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 6cf526c..cb3365f 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -42,8 +42,6 @@ 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;
47 public uint HttpPort = DefaultHttpPort; 45 public uint HttpPort = DefaultHttpPort;
48 public bool HttpSSL = DefaultHttpSSL; 46 public bool HttpSSL = DefaultHttpSSL;
49 47
@@ -98,10 +96,6 @@ namespace OpenSim.Framework
98 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 96 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
99 "Default Grid Server URI", 97 "Default Grid Server URI",
100 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false); 98 "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);
105 99
106 configMember.addConfigurationOption("default_inventory_server", 100 configMember.addConfigurationOption("default_inventory_server",
107 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 101 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
@@ -135,12 +129,6 @@ namespace OpenSim.Framework
135 case "default_grid_server": 129 case "default_grid_server":
136 GridServerURL = new Uri( (string) configuration_result ); 130 GridServerURL = new Uri( (string) configuration_result );
137 break; 131 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;
144 case "default_inventory_server": 132 case "default_inventory_server":
145 InventoryUrl = new Uri((string) configuration_result); 133 InventoryUrl = new Uri((string) configuration_result);
146 break; 134 break;