aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712008-02-13 21:35:54 +0000
committerlbsa712008-02-13 21:35:54 +0000
commit12e0d8b3165cefc252cacdbbaaa76d1c19ed735a (patch)
tree91bc4c1abec8e57b32cb5524144a25b6c1a5e89e
parent* Fixed bug in avatarpicker so now you can search on single word (diff)
downloadopensim-SC_OLD-12e0d8b3165cefc252cacdbbaaa76d1c19ed735a.zip
opensim-SC_OLD-12e0d8b3165cefc252cacdbbaaa76d1c19ed735a.tar.gz
opensim-SC_OLD-12e0d8b3165cefc252cacdbbaaa76d1c19ed735a.tar.bz2
opensim-SC_OLD-12e0d8b3165cefc252cacdbbaaa76d1c19ed735a.tar.xz
* Fixed another bug in avatarpicker ('surname'/'lastname' mixup)
[Provided by openlifegrid.com]
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs8
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
index ac45aaa..4792487 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLUserData.cs
@@ -342,7 +342,7 @@ namespace OpenSim.Framework.Data.MSSQL
342 342
343 IDbCommand result = 343 IDbCommand result =
344 database.Query( 344 database.Query(
345 "SELECT UUID,username,surname FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second", 345 "SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first AND lastname = @second",
346 param); 346 param);
347 IDataReader reader = result.ExecuteReader(); 347 IDataReader reader = result.ExecuteReader();
348 348
@@ -352,7 +352,7 @@ namespace OpenSim.Framework.Data.MSSQL
352 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 352 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
353 user.AvatarID = new LLUUID((string)reader["UUID"]); 353 user.AvatarID = new LLUUID((string)reader["UUID"]);
354 user.firstName = (string)reader["username"]; 354 user.firstName = (string)reader["username"];
355 user.lastName = (string)reader["surname"]; 355 user.lastName = (string)reader["lastname"];
356 returnlist.Add(user); 356 returnlist.Add(user);
357 } 357 }
358 reader.Close(); 358 reader.Close();
@@ -377,7 +377,7 @@ namespace OpenSim.Framework.Data.MSSQL
377 377
378 IDbCommand result = 378 IDbCommand result =
379 database.Query( 379 database.Query(
380 "SELECT UUID,username,surname FROM " + m_usersTableName + " WHERE username = @first OR lastname = @first", 380 "SELECT UUID,username,lastname FROM " + m_usersTableName + " WHERE username = @first OR lastname = @first",
381 param); 381 param);
382 IDataReader reader = result.ExecuteReader(); 382 IDataReader reader = result.ExecuteReader();
383 383
@@ -387,7 +387,7 @@ namespace OpenSim.Framework.Data.MSSQL
387 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar(); 387 Framework.AvatarPickerAvatar user = new Framework.AvatarPickerAvatar();
388 user.AvatarID = new LLUUID((string)reader["UUID"]); 388 user.AvatarID = new LLUUID((string)reader["UUID"]);
389 user.firstName = (string)reader["username"]; 389 user.firstName = (string)reader["username"];
390 user.lastName = (string)reader["surname"]; 390 user.lastName = (string)reader["lastname"];
391 returnlist.Add(user); 391 returnlist.Add(user);
392 } 392 }
393 reader.Close(); 393 reader.Close();