diff options
| author | John Hurliman | 2010-04-22 18:56:06 -0700 |
|---|---|---|
| committer | John Hurliman | 2010-04-22 18:56:06 -0700 |
| commit | 8692ac53f56c8db9942021709e7415b2b2add0c6 (patch) | |
| tree | 5681611d23f8f89b38d2c19ef032d412fd3fe3d2 /OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | |
| parent | * Better error logging for failed SimianGrid web service calls (diff) | |
| parent | Insert a ROLLBACK command on migration step failure. This ensures that (diff) | |
| download | opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.zip opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.gz opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.bz2 opensim-SC_OLD-8692ac53f56c8db9942021709e7415b2b2add0c6.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/SQLite/SQLiteAuthenticationData.cs')
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs index 2c28375..aa10734 100644 --- a/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs +++ b/OpenSim/Data/SQLite/SQLiteAuthenticationData.cs | |||
| @@ -235,7 +235,7 @@ namespace OpenSim.Data.SQLite | |||
| 235 | if (System.Environment.TickCount - m_LastExpire > 30000) | 235 | if (System.Environment.TickCount - m_LastExpire > 30000) |
| 236 | DoExpire(); | 236 | DoExpire(); |
| 237 | 237 | ||
| 238 | SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now, 'localtime', '+" + lifetime.ToString() + | 238 | SqliteCommand cmd = new SqliteCommand("update tokens set validity = datetime('now', 'localtime', '+" + lifetime.ToString() + |
| 239 | " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"); | 239 | " minutes') where UUID = '" + principalID.ToString() + "' and token = '" + token + "' and validity > datetime('now', 'localtime')"); |
| 240 | 240 | ||
| 241 | if (ExecuteNonQuery(cmd, m_Connection) > 0) | 241 | if (ExecuteNonQuery(cmd, m_Connection) > 0) |