aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712008-07-27 13:34:34 +0000
committerlbsa712008-07-27 13:34:34 +0000
commit178491803467eea8b83ae793ce12f1510cca8d83 (patch)
tree975c1e5551c4779d0b1d474b0282edb2cb502852
parentLog to console if C# line/column lookup fails. (diff)
downloadopensim-SC_OLD-178491803467eea8b83ae793ce12f1510cca8d83.zip
opensim-SC_OLD-178491803467eea8b83ae793ce12f1510cca8d83.tar.gz
opensim-SC_OLD-178491803467eea8b83ae793ce12f1510cca8d83.tar.bz2
opensim-SC_OLD-178491803467eea8b83ae793ce12f1510cca8d83.tar.xz
* Added safeguard to ensure valid inventoryserver uri.
-rw-r--r--OpenSim/Framework/UserConfig.cs19
1 files changed, 16 insertions, 3 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index eacab81..d8c83be 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -47,7 +47,20 @@ namespace OpenSim.Framework
47 public string GridServerURL = String.Empty; 47 public string GridServerURL = String.Empty;
48 public uint HttpPort = DefaultHttpPort; 48 public uint HttpPort = DefaultHttpPort;
49 public bool HttpSSL = DefaultHttpSSL; 49 public bool HttpSSL = DefaultHttpSSL;
50 public string InventoryUrl = String.Empty; 50
51 private Uri m_inventoryUrl;
52
53 public string InventoryUrl
54 {
55 get
56 {
57 return m_inventoryUrl.ToString();
58 }
59 set
60 {
61 m_inventoryUrl = new Uri(value);
62 }
63 }
51 64
52 public bool EnableLLSDLogin = true; 65 public bool EnableLLSDLogin = true;
53 66
@@ -71,7 +84,7 @@ namespace OpenSim.Framework
71 configMember.addConfigurationOption("default_grid_server", 84 configMember.addConfigurationOption("default_grid_server",
72 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 85 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
73 "Default Grid Server URI", 86 "Default Grid Server URI",
74 "http://127.0.0.1:" + GridConfig.DefaultHttpPort.ToString() + "/", false); 87 "http://127.0.0.1:" + GridConfig.DefaultHttpPort + "/", false);
75 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 88 configMember.addConfigurationOption("grid_send_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
76 "Key to send to grid server", "null", false); 89 "Key to send to grid server", "null", false);
77 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 90 configMember.addConfigurationOption("grid_recv_key", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
@@ -80,7 +93,7 @@ namespace OpenSim.Framework
80 configMember.addConfigurationOption("default_inventory_server", 93 configMember.addConfigurationOption("default_inventory_server",
81 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 94 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
82 "Default Inventory Server URI", 95 "Default Inventory Server URI",
83 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort.ToString() + "/", 96 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/",
84 false); 97 false);
85 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING, 98 configMember.addConfigurationOption("database_provider", ConfigurationOption.ConfigurationTypes.TYPE_STRING,
86 "DLL for database provider", "OpenSim.Data.MySQL.dll", false); 99 "DLL for database provider", "OpenSim.Data.MySQL.dll", false);