aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--OpenSim/Framework/UserProfileData.cs75
1 files changed, 43 insertions, 32 deletions
diff --git a/OpenSim/Framework/UserProfileData.cs b/OpenSim/Framework/UserProfileData.cs
index bc93766..6e92b7a 100644
--- a/OpenSim/Framework/UserProfileData.cs
+++ b/OpenSim/Framework/UserProfileData.cs
@@ -122,6 +122,11 @@ namespace OpenSim.Framework
122 private string _surname; 122 private string _surname;
123 123
124 /// <summary> 124 /// <summary>
125 /// A valid email address for the account. Useful for password reset requests.
126 /// </summary>
127 private string _email;
128
129 /// <summary>
125 /// A URI to the users asset server, used for foreigners and large grids. 130 /// A URI to the users asset server, used for foreigners and large grids.
126 /// </summary> 131 /// </summary>
127 private string _userAssetURI = String.Empty; 132 private string _userAssetURI = String.Empty;
@@ -172,196 +177,202 @@ namespace OpenSim.Framework
172 } 177 }
173 178
174 // Property wrappers 179 // Property wrappers
175 public virtual UUID ID 180 public UUID ID
176 { 181 {
177 get { return _id; } 182 get { return _id; }
178 set { _id = value; } 183 set { _id = value; }
179 } 184 }
180 185
181 public virtual UUID WebLoginKey 186 public UUID WebLoginKey
182 { 187 {
183 get { return _webLoginKey; } 188 get { return _webLoginKey; }
184 set { _webLoginKey = value; } 189 set { _webLoginKey = value; }
185 } 190 }
186 191
187 public virtual string FirstName 192 public string FirstName
188 { 193 {
189 get { return _firstname; } 194 get { return _firstname; }
190 set { _firstname = value; } 195 set { _firstname = value; }
191 } 196 }
192 197
193 public virtual string SurName 198 public string SurName
194 { 199 {
195 get { return _surname; } 200 get { return _surname; }
196 set { _surname = value; } 201 set { _surname = value; }
197 } 202 }
198 203
199 public virtual string PasswordHash 204 public string Email
205 {
206 get { return _email; }
207 set { _email = value; }
208 }
209
210 public string PasswordHash
200 { 211 {
201 get { return _passwordHash; } 212 get { return _passwordHash; }
202 set { _passwordHash = value; } 213 set { _passwordHash = value; }
203 } 214 }
204 215
205 public virtual string PasswordSalt 216 public string PasswordSalt
206 { 217 {
207 get { return _passwordSalt; } 218 get { return _passwordSalt; }
208 set { _passwordSalt = value; } 219 set { _passwordSalt = value; }
209 } 220 }
210 221
211 public virtual uint HomeRegionX 222 public uint HomeRegionX
212 { 223 {
213 get { return _homeRegionX; } 224 get { return _homeRegionX; }
214 set { _homeRegionX = value; } 225 set { _homeRegionX = value; }
215 } 226 }
216 227
217 public virtual uint HomeRegionY 228 public uint HomeRegionY
218 { 229 {
219 get { return _homeRegionY; } 230 get { return _homeRegionY; }
220 set { _homeRegionY = value; } 231 set { _homeRegionY = value; }
221 } 232 }
222 233
223 public virtual Vector3 HomeLocation 234 public Vector3 HomeLocation
224 { 235 {
225 get { return _homeLocation; } 236 get { return _homeLocation; }
226 set { _homeLocation = value; } 237 set { _homeLocation = value; }
227 } 238 }
228 239
229 // for handy serialization 240 // for handy serialization
230 public virtual float HomeLocationX 241 public float HomeLocationX
231 { 242 {
232 get { return _homeLocation.X; } 243 get { return _homeLocation.X; }
233 set { _homeLocation.X = value; } 244 set { _homeLocation.X = value; }
234 } 245 }
235 246
236 public virtual float HomeLocationY 247 public float HomeLocationY
237 { 248 {
238 get { return _homeLocation.Y; } 249 get { return _homeLocation.Y; }
239 set { _homeLocation.Y = value; } 250 set { _homeLocation.Y = value; }
240 } 251 }
241 252
242 public virtual float HomeLocationZ 253 public float HomeLocationZ
243 { 254 {
244 get { return _homeLocation.Z; } 255 get { return _homeLocation.Z; }
245 set { _homeLocation.Z = value; } 256 set { _homeLocation.Z = value; }
246 } 257 }
247 258
248 259
249 public virtual Vector3 HomeLookAt 260 public Vector3 HomeLookAt
250 { 261 {
251 get { return _homeLookAt; } 262 get { return _homeLookAt; }
252 set { _homeLookAt = value; } 263 set { _homeLookAt = value; }
253 } 264 }
254 265
255 // for handy serialization 266 // for handy serialization
256 public virtual float HomeLookAtX 267 public float HomeLookAtX
257 { 268 {
258 get { return _homeLookAt.X; } 269 get { return _homeLookAt.X; }
259 set { _homeLookAt.X = value; } 270 set { _homeLookAt.X = value; }
260 } 271 }
261 272
262 public virtual float HomeLookAtY 273 public float HomeLookAtY
263 { 274 {
264 get { return _homeLookAt.Y; } 275 get { return _homeLookAt.Y; }
265 set { _homeLookAt.Y = value; } 276 set { _homeLookAt.Y = value; }
266 } 277 }
267 278
268 public virtual float HomeLookAtZ 279 public float HomeLookAtZ
269 { 280 {
270 get { return _homeLookAt.Z; } 281 get { return _homeLookAt.Z; }
271 set { _homeLookAt.Z = value; } 282 set { _homeLookAt.Z = value; }
272 } 283 }
273 284
274 public virtual int Created 285 public int Created
275 { 286 {
276 get { return _created; } 287 get { return _created; }
277 set { _created = value; } 288 set { _created = value; }
278 } 289 }
279 290
280 public virtual int LastLogin 291 public int LastLogin
281 { 292 {
282 get { return _lastLogin; } 293 get { return _lastLogin; }
283 set { _lastLogin = value; } 294 set { _lastLogin = value; }
284 } 295 }
285 296
286 public virtual UUID RootInventoryFolderID 297 public UUID RootInventoryFolderID
287 { 298 {
288 get { return _rootInventoryFolderID; } 299 get { return _rootInventoryFolderID; }
289 set { _rootInventoryFolderID = value; } 300 set { _rootInventoryFolderID = value; }
290 } 301 }
291 302
292 public virtual string UserInventoryURI 303 public string UserInventoryURI
293 { 304 {
294 get { return _userInventoryURI; } 305 get { return _userInventoryURI; }
295 set { _userInventoryURI = value; } 306 set { _userInventoryURI = value; }
296 } 307 }
297 308
298 public virtual string UserAssetURI 309 public string UserAssetURI
299 { 310 {
300 get { return _userAssetURI; } 311 get { return _userAssetURI; }
301 set { _userAssetURI = value; } 312 set { _userAssetURI = value; }
302 } 313 }
303 314
304 public virtual uint CanDoMask 315 public uint CanDoMask
305 { 316 {
306 get { return _profileCanDoMask; } 317 get { return _profileCanDoMask; }
307 set { _profileCanDoMask = value; } 318 set { _profileCanDoMask = value; }
308 } 319 }
309 320
310 public virtual uint WantDoMask 321 public uint WantDoMask
311 { 322 {
312 get { return _profileWantDoMask; } 323 get { return _profileWantDoMask; }
313 set { _profileWantDoMask = value; } 324 set { _profileWantDoMask = value; }
314 } 325 }
315 326
316 public virtual string AboutText 327 public string AboutText
317 { 328 {
318 get { return _profileAboutText; } 329 get { return _profileAboutText; }
319 set { _profileAboutText = value; } 330 set { _profileAboutText = value; }
320 } 331 }
321 332
322 public virtual string FirstLifeAboutText 333 public string FirstLifeAboutText
323 { 334 {
324 get { return _profileFirstText; } 335 get { return _profileFirstText; }
325 set { _profileFirstText = value; } 336 set { _profileFirstText = value; }
326 } 337 }
327 338
328 public virtual UUID Image 339 public UUID Image
329 { 340 {
330 get { return _profileImage; } 341 get { return _profileImage; }
331 set { _profileImage = value; } 342 set { _profileImage = value; }
332 } 343 }
333 344
334 public virtual UUID FirstLifeImage 345 public UUID FirstLifeImage
335 { 346 {
336 get { return _profileFirstImage; } 347 get { return _profileFirstImage; }
337 set { _profileFirstImage = value; } 348 set { _profileFirstImage = value; }
338 } 349 }
339 350
340 public virtual UserAgentData CurrentAgent 351 public UserAgentData CurrentAgent
341 { 352 {
342 get { return _currentAgent; } 353 get { return _currentAgent; }
343 set { _currentAgent = value; } 354 set { _currentAgent = value; }
344 } 355 }
345 356
346 public virtual int UserFlags 357 public int UserFlags
347 { 358 {
348 get { return _userFlags; } 359 get { return _userFlags; }
349 set { _userFlags = value; } 360 set { _userFlags = value; }
350 } 361 }
351 362
352 public virtual int GodLevel 363 public int GodLevel
353 { 364 {
354 get { return _godLevel; } 365 get { return _godLevel; }
355 set { _godLevel = value; } 366 set { _godLevel = value; }
356 } 367 }
357 368
358 public virtual string CustomType 369 public string CustomType
359 { 370 {
360 get { return _customType; } 371 get { return _customType; }
361 set { _customType = value; } 372 set { _customType = value; }
362 } 373 }
363 374
364 public virtual UUID Partner 375 public UUID Partner
365 { 376 {
366 get { return _partner; } 377 get { return _partner; }
367 set { _partner = value; } 378 set { _partner = value; }