aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authordiva2009-03-27 16:23:52 +0000
committerdiva2009-03-27 16:23:52 +0000
commit6b9125b31944c126fa9bf25529a27de5c3972244 (patch)
tree45ad9a9480dffab1bfe357afed744365e13ad665 /OpenSim/Framework
parentsvn:eol-style property set. (diff)
downloadopensim-SC_OLD-6b9125b31944c126fa9bf25529a27de5c3972244.zip
opensim-SC_OLD-6b9125b31944c126fa9bf25529a27de5c3972244.tar.gz
opensim-SC_OLD-6b9125b31944c126fa9bf25529a27de5c3972244.tar.bz2
opensim-SC_OLD-6b9125b31944c126fa9bf25529a27de5c3972244.tar.xz
Added the hg login procedure to the user server.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/UserConfig.cs32
1 files changed, 30 insertions, 2 deletions
diff --git a/OpenSim/Framework/UserConfig.cs b/OpenSim/Framework/UserConfig.cs
index 901b57a..ea2cba0 100644
--- a/OpenSim/Framework/UserConfig.cs
+++ b/OpenSim/Framework/UserConfig.cs
@@ -64,6 +64,19 @@ namespace OpenSim.Framework
64 } 64 }
65 } 65 }
66 66
67 private Uri m_authUrl;
68 public Uri AuthUrl
69 {
70 get
71 {
72 return m_authUrl;
73 }
74 set
75 {
76 m_authUrl = value;
77 }
78 }
79
67 private Uri m_gridServerURL; 80 private Uri m_gridServerURL;
68 81
69 public Uri GridServerURL 82 public Uri GridServerURL
@@ -80,6 +93,8 @@ namespace OpenSim.Framework
80 93
81 public bool EnableLLSDLogin = true; 94 public bool EnableLLSDLogin = true;
82 95
96 public bool EnableHGLogin = true;
97
83 public UserConfig() 98 public UserConfig()
84 { 99 {
85 // weird, but UserManagerBase needs this. 100 // weird, but UserManagerBase needs this.
@@ -111,6 +126,11 @@ namespace OpenSim.Framework
111 "Default Inventory Server URI", 126 "Default Inventory Server URI",
112 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/", 127 "http://127.0.0.1:" + InventoryConfig.DefaultHttpPort + "/",
113 false); 128 false);
129 configMember.addConfigurationOption("default_authentication_server",
130 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
131 "User Server (this) External URI for authentication keys",
132 "http://localhost:" + UserConfig.DefaultHttpPort + "/",
133 false);
114 configMember.addConfigurationOption("library_location", 134 configMember.addConfigurationOption("library_location",
115 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY, 135 ConfigurationOption.ConfigurationTypes.TYPE_STRING_NOT_EMPTY,
116 "Path to library control file", 136 "Path to library control file",
@@ -131,7 +151,10 @@ namespace OpenSim.Framework
131 "Known good region Y", "1000", false); 151 "Known good region Y", "1000", false);
132 configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN, 152 configMember.addConfigurationOption("enable_llsd_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
133 "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false); 153 "Enable LLSD login support [Currently used by libsl based clients/bots]? true/false", true.ToString(), false);
134 154
155 configMember.addConfigurationOption("enable_hg_login", ConfigurationOption.ConfigurationTypes.TYPE_BOOLEAN,
156 "Enable Hypergrid login support [Currently used by GridSurfer-proxied clients]? true/false", true.ToString(), false);
157
135 configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32, 158 configMember.addConfigurationOption("default_loginLevel", ConfigurationOption.ConfigurationTypes.TYPE_UINT32,
136 "Minimum Level a user should have to login [0 default]", "0", false); 159 "Minimum Level a user should have to login [0 default]", "0", false);
137 160
@@ -156,6 +179,9 @@ namespace OpenSim.Framework
156 case "default_inventory_server": 179 case "default_inventory_server":
157 InventoryUrl = new Uri((string) configuration_result); 180 InventoryUrl = new Uri((string) configuration_result);
158 break; 181 break;
182 case "default_authentication_server":
183 AuthUrl = new Uri((string)configuration_result);
184 break;
159 case "database_provider": 185 case "database_provider":
160 DatabaseProvider = (string) configuration_result; 186 DatabaseProvider = (string) configuration_result;
161 break; 187 break;
@@ -177,7 +203,9 @@ namespace OpenSim.Framework
177 case "enable_llsd_login": 203 case "enable_llsd_login":
178 EnableLLSDLogin = (bool)configuration_result; 204 EnableLLSDLogin = (bool)configuration_result;
179 break; 205 break;
180 206 case "enable_hg_login":
207 EnableHGLogin = (bool)configuration_result;
208 break;
181 case "default_loginLevel": 209 case "default_loginLevel":
182 DefaultUserLevel = (uint)configuration_result; 210 DefaultUserLevel = (uint)configuration_result;
183 break; 211 break;