aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/Configuration/UserConfig.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Framework/General/Configuration/UserConfig.cs')
-rw-r--r--OpenSim/Framework/General/Configuration/UserConfig.cs14
1 files changed, 8 insertions, 6 deletions
diff --git a/OpenSim/Framework/General/Configuration/UserConfig.cs b/OpenSim/Framework/General/Configuration/UserConfig.cs
index 9d607b3..a027ffc 100644
--- a/OpenSim/Framework/General/Configuration/UserConfig.cs
+++ b/OpenSim/Framework/General/Configuration/UserConfig.cs
@@ -24,16 +24,16 @@ namespace OpenSim.Framework.Configuration
24 24
25 public void loadConfigurationOptions() 25 public void loadConfigurationOptions()
26 { 26 {
27 configMember.addConfigurationOption("default_startup_message",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Default Startup Message","Welcome to OGS"); 27 configMember.addConfigurationOption("default_startup_message", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Startup Message", "Welcome to OGS",false);
28 28
29 configMember.addConfigurationOption("default_grid_server",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Default Grid Server URI","http://127.0.0.1:8001/"); 29 configMember.addConfigurationOption("default_grid_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Grid Server URI", "http://127.0.0.1:8001/", false);
30 configMember.addConfigurationOption("grid_send_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to send to grid server","null"); 30 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to grid server", "null", false);
31 configMember.addConfigurationOption("grid_recv_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to expect from grid server","null"); 31 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from grid server", "null", false);
32 32
33 33
34 } 34 }
35 35
36 public void handleIncomingConfiguration(string configuration_key, object configuration_result) 36 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
37 { 37 {
38 switch (configuration_key) 38 switch (configuration_key)
39 { 39 {
@@ -50,6 +50,8 @@ namespace OpenSim.Framework.Configuration
50 this.GridRecvKey = (string)configuration_result; 50 this.GridRecvKey = (string)configuration_result;
51 break; 51 break;
52 } 52 }
53
54 return true;
53 } 55 }
54 } 56 }
55} 57}