* Fixed another bug in avatarpicker ('surname'/'lastname' mixup)

[Provided by openlifegrid.com]
ThreadPoolClientBranch
lbsa71 2008-02-13 21:35:54 +00:00
parent 2c48ceedd8
commit 12e0d8b316
1 changed files with 4 additions and 4 deletions

View File

@ -342,7 +342,7 @@ namespace OpenSim.Framework.Data.MSSQL
IDbCommand result = IDbCommand result =
database.Query( database.Query(
"SELECT UUID,username,surname FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second", "SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second",
param); param);
IDataReader reader = result.ExecuteReader(); IDataReader reader = result.ExecuteReader();
@ -352,7 +352,7 @@ namespace OpenSim.Framework.Data.MSSQL
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
user.AvatarID = new LLUUID((string)reader["UUID"]); user.AvatarID = new LLUUID((string)reader["UUID"]);
user.firstName = (string)reader["username"]; user.firstName = (string)reader["username"];
user.lastName = (string)reader["surname"]; user.lastName = (string)reader["lastname"];
returnlist.Add(user); returnlist.Add(user);
} }
reader.Close(); reader.Close();
@ -377,7 +377,7 @@ namespace OpenSim.Framework.Data.MSSQL
IDbCommand result = IDbCommand result =
database.Query( database.Query(
"SELECT UUID,username,surname FROM " + m_usersTableName + " WHERE username = @first OR lastname = @first", "SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first OR lastname = @first",
param); param);
IDataReader reader = result.ExecuteReader(); IDataReader reader = result.ExecuteReader();
@ -387,7 +387,7 @@ namespace OpenSim.Framework.Data.MSSQL
Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
user.AvatarID = new LLUUID((string)reader["UUID"]); user.AvatarID = new LLUUID((string)reader["UUID"]);
user.firstName = (string)reader["username"]; user.firstName = (string)reader["username"];
user.lastName = (string)reader["surname"]; user.lastName = (string)reader["lastname"];
returnlist.Add(user); returnlist.Add(user);
} }
reader.Close(); reader.Close();