aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL/MySQLUserData.cs
diff options
context:
space:
mode:
Diffstat (limited to 'OpenSim/Data/MySQL/MySQLUserData.cs')
-rw-r--r--OpenSim/Data/MySQL/MySQLUserData.cs13
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs
index d04c932..66b65dc 100644
--- a/OpenSim/Data/MySQL/MySQLUserData.cs
+++ b/OpenSim/Data/MySQL/MySQLUserData.cs
@@ -28,10 +28,11 @@
28using System; 28using System;
29using System.Collections.Generic; 29using System.Collections.Generic;
30using System.Data; 30using System.Data;
31using System.Reflection;
31using System.Text.RegularExpressions; 32using System.Text.RegularExpressions;
32using libsecondlife; 33using libsecondlife;
34using log4net;
33using OpenSim.Framework; 35using OpenSim.Framework;
34using OpenSim.Framework.Console;
35 36
36namespace OpenSim.Data.MySQL 37namespace OpenSim.Data.MySQL
37{ 38{
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MySQL
40 /// </summary> 41 /// </summary>
41 internal class MySQLUserData : UserDataBase 42 internal class MySQLUserData : UserDataBase
42 { 43 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
44 45
45 /// <summary> 46 /// <summary>
46 /// Database manager for MySQL 47 /// Database manager for MySQL
@@ -348,9 +349,9 @@ namespace OpenSim.Data.MySQL
348 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called"); 349 m_log.Info("[USER]: Stub UpdateUserCUrrentRegion called");
349 } 350 }
350 351
351 override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) 352 override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query)
352 { 353 {
353 List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); 354 List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>();
354 355
355 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]"); 356 Regex objAlphaNumericPattern = new Regex("[^a-zA-Z0-9]");
356 357
@@ -373,7 +374,7 @@ namespace OpenSim.Data.MySQL
373 374
374 while (reader.Read()) 375 while (reader.Read())
375 { 376 {
376 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 377 AvatarPickerAvatar user = new AvatarPickerAvatar();
377 user.AvatarID = new LLUUID((string) reader["UUID"]); 378 user.AvatarID = new LLUUID((string) reader["UUID"]);
378 user.firstName = (string) reader["username"]; 379 user.firstName = (string) reader["username"];
379 user.lastName = (string) reader["lastname"]; 380 user.lastName = (string) reader["lastname"];
@@ -407,7 +408,7 @@ namespace OpenSim.Data.MySQL
407 408
408 while (reader.Read()) 409 while (reader.Read())
409 { 410 {
410 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 411 AvatarPickerAvatar user = new AvatarPickerAvatar();
411 user.AvatarID = new LLUUID((string) reader["UUID"]); 412 user.AvatarID = new LLUUID((string) reader["UUID"]);
412 user.firstName = (string) reader["username"]; 413 user.firstName = (string) reader["username"];
413 user.lastName = (string) reader["lastname"]; 414 user.lastName = (string) reader["lastname"];