aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorlbsa712008-07-29 19:52:58 +0000
committerlbsa712008-07-29 19:52:58 +0000
commit8edab95bad417a4d82cdfb6e9ef3138e8c5f0ab1 (patch)
treef711c63ba64fea7489189c8d859977115022ac7f /OpenSim/Framework
parent* minor: temporarily command out variables to prevent compile warnings (diff)
downloadopensim-SC_OLD-8edab95bad417a4d82cdfb6e9ef3138e8c5f0ab1.zip
opensim-SC_OLD-8edab95bad417a4d82cdfb6e9ef3138e8c5f0ab1.tar.gz
opensim-SC_OLD-8edab95bad417a4d82cdfb6e9ef3138e8c5f0ab1.tar.bz2
opensim-SC_OLD-8edab95bad417a4d82cdfb6e9ef3138e8c5f0ab1.tar.xz
* Refactored some heavily duplicated RequestSimProfileData functions
* Changed InventoryUrl and GridServerURL type to Uri instead of string - to address '/' issues.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/UserConfig.cs25
1 files changed, 19 insertions, 6 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index d8c83be..6cf526c 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -44,21 +44,34 @@ namespace OpenSim.Framework
44 public uint DefaultY = 1000; 44 public uint DefaultY = 1000;
45 public string GridRecvKey = String.Empty; 45 public string GridRecvKey = String.Empty;
46 public string GridSendKey = String.Empty; 46 public string GridSendKey = String.Empty;
47 public string GridServerURL = String.Empty;
48 public uint HttpPort = DefaultHttpPort; 47 public uint HttpPort = DefaultHttpPort;
49 public bool HttpSSL = DefaultHttpSSL; 48 public bool HttpSSL = DefaultHttpSSL;
50 49
51 private Uri m_inventoryUrl; 50 private Uri m_inventoryUrl;
52 51
53 public string InventoryUrl 52 public Uri InventoryUrl
54 { 53 {
55 get 54 get
56 { 55 {
57 return m_inventoryUrl.ToString(); 56 return m_inventoryUrl;
58 } 57 }
59 set 58 set
60 { 59 {
61 m_inventoryUrl = new Uri(value); 60 m_inventoryUrl = value;
61 }
62 }
63
64 private Uri m_gridServerURL;
65
66 public Uri GridServerURL
67 {
68 get
69 {
70 return m_gridServerURL;
71 }
72 set
73 {
74 m_gridServerURL = value;
62 } 75 }
63 } 76 }
64 77
@@ -120,7 +133,7 @@ namespace OpenSim.Framework
120 DefaultStartupMsg = (string) configuration_result; 133 DefaultStartupMsg = (string) configuration_result;
121 break; 134 break;
122 case "default_grid_server": 135 case "default_grid_server":
123 GridServerURL = (string) configuration_result; 136 GridServerURL = new Uri( (string) configuration_result );
124 break; 137 break;
125 case "grid_send_key": 138 case "grid_send_key":
126 GridSendKey = (string) configuration_result; 139 GridSendKey = (string) configuration_result;
@@ -129,7 +142,7 @@ namespace OpenSim.Framework
129 GridRecvKey = (string) configuration_result; 142 GridRecvKey = (string) configuration_result;
130 break; 143 break;
131 case "default_inventory_server": 144 case "default_inventory_server":
132 InventoryUrl = (string) configuration_result; 145 InventoryUrl = new Uri((string) configuration_result);
133 break; 146 break;
134 case "database_provider": 147 case "database_provider":
135 DatabaseProvider = (string) configuration_result; 148 DatabaseProvider = (string) configuration_result;