aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/General/Configuration/GridConfig.cs
diff options
context:
space:
mode:
authormingchen2007-07-19 15:01:14 +0000
committermingchen2007-07-19 15:01:14 +0000
commitde104536c156ebc743578a23dcc2950d20b6724e (patch)
tree38f2cece8e87faf533121d6f26479ecde00d21e3 /OpenSim/Framework/General/Configuration/GridConfig.cs
parentAdded some Alert methods to Scene , and a console command handler. So from th... (diff)
downloadopensim-SC_OLD-de104536c156ebc743578a23dcc2950d20b6724e.zip
opensim-SC_OLD-de104536c156ebc743578a23dcc2950d20b6724e.tar.gz
opensim-SC_OLD-de104536c156ebc743578a23dcc2950d20b6724e.tar.bz2
opensim-SC_OLD-de104536c156ebc743578a23dcc2950d20b6724e.tar.xz
*Handler Functions can now refuse an object as invalid by returning false, thus forcing the user to re-enter the data
*Added TYPE_STRING_NOT_EMPTY that requires some sort of text to be entered *Added another parameter to addConfigurationOption called use_default_no_prompt that will not ask via the console a configuration option; it will use whatever is in the config file. If nothing is in the config file for that option, it will force itself to use default
Diffstat (limited to 'OpenSim/Framework/General/Configuration/GridConfig.cs')
-rw-r--r--OpenSim/Framework/General/Configuration/GridConfig.cs22
1 files changed, 12 insertions, 10 deletions
diff --git a/OpenSim/Framework/General/Configuration/GridConfig.cs b/OpenSim/Framework/General/Configuration/GridConfig.cs
index 97dd699..0a7f65c 100644
--- a/OpenSim/Framework/General/Configuration/GridConfig.cs
+++ b/OpenSim/Framework/General/Configuration/GridConfig.cs
@@ -27,21 +27,21 @@ namespace OpenSim.Framework.Configuration
27 27
28 public void loadConfigurationOptions() 28 public void loadConfigurationOptions()
29 { 29 {
30 configMember.addConfigurationOption("grid_owner",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"OGS Grid Owner","OGS development team"); 30 configMember.addConfigurationOption("grid_owner", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "OGS Grid Owner", "OGS development team", false);
31 configMember.addConfigurationOption("default_asset_server",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Default Asset Server URI","http://127.0.0.1:8003/"); 31 configMember.addConfigurationOption("default_asset_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default Asset Server URI", "http://127.0.0.1:8003/", false);
32 configMember.addConfigurationOption("asset_send_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to send to asset server","null"); 32 configMember.addConfigurationOption("asset_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to asset server", "null", false);
33 configMember.addConfigurationOption("asset_recv_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to expect from asset server","null"); 33 configMember.addConfigurationOption("asset_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from asset server", "null", false);
34 34
35 configMember.addConfigurationOption("default_user_server",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Default User Server URI","http://127.0.0.1:8002/"); 35 configMember.addConfigurationOption("default_user_server", ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, "Default User Server URI", "http://127.0.0.1:8002/", false);
36 configMember.addConfigurationOption("user_send_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to send to user server","null"); 36 configMember.addConfigurationOption("user_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to user server", "null", false);
37 configMember.addConfigurationOption("user_recv_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to expect from user server","null"); 37 configMember.addConfigurationOption("user_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from user server", "null", false);
38 38
39 configMember.addConfigurationOption("sim_send_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to send to a simulator","null"); 39 configMember.addConfigurationOption("sim_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to send to a simulator", "null", false);
40 configMember.addConfigurationOption("sim_recv_key",ConfigurationOption.ConfigurationTypes.TYPE_STRING,"Key to expect from a simulator","null"); 40 configMember.addConfigurationOption("sim_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, "Key to expect from a simulator", "null", false);
41 41
42 } 42 }
43 43
44 public void handleIncomingConfiguration(string configuration_key, object configuration_result) 44 public bool handleIncomingConfiguration(string configuration_key, object configuration_result)
45 { 45 {
46 switch (configuration_key) 46 switch (configuration_key)
47 { 47 {
@@ -73,6 +73,8 @@ namespace OpenSim.Framework.Configuration
73 this.SimRecvKey = (string)configuration_result; 73 this.SimRecvKey = (string)configuration_result;
74 break; 74 break;
75 } 75 }
76
77 return true;
76 } 78 }
77 } 79 }
78} 80}