diff options
| author | Justin Clark-Casey (justincc) | 2010-04-16 23:24:34 +0100 |
|---|---|---|
| committer | Justin Clark-Casey (justincc) | 2010-04-16 23:24:34 +0100 |
| commit | cac12eca79b82b8d0cbb7f638cb3d9c2ba5d5d41 (patch) | |
| tree | 261206eca1c23727d231d5948c801bcd51e395f9 /OpenSim | |
| parent | refactor: crudely move DetachSingleAttachmentToGround() over to the Attachmen... (diff) | |
| parent | Bug fix in SQLite/SQLiteUserAccountData.cs: Missing'(' in one of the SQL stat... (diff) | |
| download | opensim-SC_OLD-cac12eca79b82b8d0cbb7f638cb3d9c2ba5d5d41.zip opensim-SC_OLD-cac12eca79b82b8d0cbb7f638cb3d9c2ba5d5d41.tar.gz opensim-SC_OLD-cac12eca79b82b8d0cbb7f638cb3d9c2ba5d5d41.tar.bz2 opensim-SC_OLD-cac12eca79b82b8d0cbb7f638cb3d9c2ba5d5d41.tar.xz | |
Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserAccountData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs index 50e8c23..67cf716 100644 --- a/OpenSim/Data/SQLite/SQLiteUserAccountData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserAccountData.cs | |||
| @@ -66,7 +66,7 @@ namespace OpenSim.Data.SQLite | |||
| 66 | 66 | ||
| 67 | if (words.Length == 1) | 67 | if (words.Length == 1) |
| 68 | { | 68 | { |
| 69 | cmd.CommandText = String.Format("select * from {0} where ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')", | 69 | cmd.CommandText = String.Format("select * from {0} where (ScopeID='{1}' or ScopeID='00000000-0000-0000-0000-000000000000') and (FirstName like '{2}%' or LastName like '{2}%')", |
| 70 | m_Realm, scopeID.ToString(), words[0]); | 70 | m_Realm, scopeID.ToString(), words[0]); |
| 71 | } | 71 | } |
| 72 | else | 72 | else |