diff options
author | Teravus Ovares | 2007-11-30 21:01:03 +0000 |
---|---|---|
committer | Teravus Ovares | 2007-11-30 21:01:03 +0000 |
commit | b2870150281971ca020392a62ba6bdb441798cae (patch) | |
tree | 4a6b26c23d830de09ac9d110253f5ea76214a711 /OpenSim/Framework/Data.SQLite | |
parent | Patch for mantis 0000015: Textures don't display in the object (diff) | |
download | opensim-SC_OLD-b2870150281971ca020392a62ba6bdb441798cae.zip opensim-SC_OLD-b2870150281971ca020392a62ba6bdb441798cae.tar.gz opensim-SC_OLD-b2870150281971ca020392a62ba6bdb441798cae.tar.bz2 opensim-SC_OLD-b2870150281971ca020392a62ba6bdb441798cae.tar.xz |
* Fixed a bug in my 'user already logged in' fix that could cause a null reference exception.
Diffstat (limited to 'OpenSim/Framework/Data.SQLite')
-rw-r--r-- | OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs index 3e3ab71..068ff4b 100644 --- a/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs +++ b/OpenSim/Framework/Data.SQLite/SQLiteUserData.cs | |||
@@ -276,14 +276,16 @@ namespace OpenSim.Framework.Data.SQLite | |||
276 | { | 276 | { |
277 | // I just added this to help the standalone login situation. | 277 | // I just added this to help the standalone login situation. |
278 | //It still needs to be looked at by a Database guy | 278 | //It still needs to be looked at by a Database guy |
279 | DataTable ua = ds.Tables["useragents"]; | ||
280 | row = ua.Rows.Find(user.UUID); | ||
281 | |||
279 | if (row == null) | 282 | if (row == null) |
280 | { | 283 | { |
281 | // do nothing | 284 | // do nothing |
282 | } | 285 | } |
283 | else | 286 | else |
284 | { | 287 | { |
285 | DataTable ua = ds.Tables["useragents"]; | 288 | |
286 | row = ua.Rows.Find(user.UUID); | ||
287 | row.Delete(); | 289 | row.Delete(); |
288 | ua.AcceptChanges(); | 290 | ua.AcceptChanges(); |
289 | } | 291 | } |