diff options
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLUserData.cs')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserData.cs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserData.cs b/OpenSim/Data/MSSQL/MSSQLUserData.cs index 3d4cabf..a44d022 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserData.cs | |||
@@ -29,9 +29,10 @@ using System; | |||
29 | using System.Collections.Generic; | 29 | using System.Collections.Generic; |
30 | using System.Data; | 30 | using System.Data; |
31 | using System.Data.SqlClient; | 31 | using System.Data.SqlClient; |
32 | using System.Reflection; | ||
32 | using libsecondlife; | 33 | using libsecondlife; |
34 | using log4net; | ||
33 | using OpenSim.Framework; | 35 | using OpenSim.Framework; |
34 | using OpenSim.Framework.Console; | ||
35 | 36 | ||
36 | namespace OpenSim.Data.MSSQL | 37 | namespace OpenSim.Data.MSSQL |
37 | { | 38 | { |
@@ -40,7 +41,7 @@ namespace OpenSim.Data.MSSQL | |||
40 | /// </summary> | 41 | /// </summary> |
41 | public class MSSQLUserData : UserDataBase | 42 | public class MSSQLUserData : 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 |
@@ -326,9 +327,9 @@ namespace OpenSim.Data.MSSQL | |||
326 | 327 | ||
327 | 328 | ||
328 | 329 | ||
329 | override public List<Framework.AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) | 330 | override public List<AvatarPickerAvatar> GeneratePickerResults(LLUUID queryID, string query) |
330 | { | 331 | { |
331 | List<Framework.AvatarPickerAvatar> returnlist = new List<Framework.AvatarPickerAvatar>(); | 332 | List<AvatarPickerAvatar> returnlist = new List<AvatarPickerAvatar>(); |
332 | string[] querysplit; | 333 | string[] querysplit; |
333 | querysplit = query.Split(' '); | 334 | querysplit = query.Split(' '); |
334 | if (querysplit.Length == 2) | 335 | if (querysplit.Length == 2) |
@@ -350,7 +351,7 @@ namespace OpenSim.Data.MSSQL | |||
350 | 351 | ||
351 | while (reader.Read()) | 352 | while (reader.Read()) |
352 | { | 353 | { |
353 | Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); | 354 | AvatarPickerAvatar user = new AvatarPickerAvatar(); |
354 | user.AvatarID = new LLUUID((string)reader["UUID"]); | 355 | user.AvatarID = new LLUUID((string)reader["UUID"]); |
355 | user.firstName = (string)reader["username"]; | 356 | user.firstName = (string)reader["username"]; |
356 | user.lastName = (string)reader["lastname"]; | 357 | user.lastName = (string)reader["lastname"]; |
@@ -385,7 +386,7 @@ namespace OpenSim.Data.MSSQL | |||
385 | 386 | ||
386 | while (reader.Read()) | 387 | while (reader.Read()) |
387 | { | 388 | { |
388 | Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); | 389 | AvatarPickerAvatar user = new AvatarPickerAvatar(); |
389 | user.AvatarID = new LLUUID((string)reader["UUID"]); | 390 | user.AvatarID = new LLUUID((string)reader["UUID"]); |
390 | user.firstName = (string)reader["username"]; | 391 | user.firstName = (string)reader["username"]; |
391 | user.lastName = (string)reader["lastname"]; | 392 | user.lastName = (string)reader["lastname"]; |