aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--OpenSim/Framework/InventoryConfig.cs12
1 files changed, 0 insertions, 12 deletions
diff --git a/OpenSim/Framework/InventoryConfig.cs b/OpenSim/Framework/InventoryConfig.cs
index a6855d3..ef8a28a 100644
--- a/OpenSim/Framework/InventoryConfig.cs
+++ b/OpenSim/Framework/InventoryConfig.cs
@@ -41,8 +41,6 @@ namespace OpenSim.Framework
41 public string DatabaseProvider = String.Empty; 41 public string DatabaseProvider = String.Empty;
42 public string DefaultStartupMsg = String.Empty; 42 public string DefaultStartupMsg = String.Empty;
43 public uint HttpPort = DefaultHttpPort; 43 public uint HttpPort = DefaultHttpPort;
44 public string UserRecvKey = String.Empty;
45 public string UserSendKey = String.Empty;
46 public string UserServerURL = String.Empty; 44 public string UserServerURL = String.Empty;
47 public bool SessionLookUp = true; 45 public bool SessionLookUp = true;
48 46
@@ -59,10 +57,6 @@ namespace OpenSim.Framework
59 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 57 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
60 "Default User Server URI", 58 "Default User Server URI",
61 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false); 59 "http://127.0.0.1:" + UserConfig.DefaultHttpPort.ToString(), false);
62 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
63 "Key to send to user server", "null", false);
64 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
65 "Key to expect from user server", "null", false);
66 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 60 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
67 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 61 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);
68 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 62 configMember.addConfigurationOption("database_connect", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -80,12 +74,6 @@ namespace OpenSim.Framework
80 case "default_user_server": 74 case "default_user_server":
81 UserServerURL = (string) configuration_result; 75 UserServerURL = (string) configuration_result;
82 break; 76 break;
83 case "user_send_key":
84 UserSendKey = (string) configuration_result;
85 break;
86 case "user_recv_key":
87 UserRecvKey = (string) configuration_result;
88 break;
89 case "database_provider": 77 case "database_provider":
90 DatabaseProvider = (string) configuration_result; 78 DatabaseProvider = (string) configuration_result;
91 break; 79 break;