aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorMelanie2010-01-01 22:51:00 +0000
committerMelanie2010-01-01 22:51:00 +0000
commit0d9591bf3562955a39c57dd289d0cc0bb0ba85a3 (patch)
treec0ee2bf1f6227c2aa2e9c3c3726bbba6ef75de8e /OpenSim/Data/MySQL
parentPut PassCollision on the ignore list for testing, since we don't save that (diff)
downloadopensim-SC-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.zip
opensim-SC-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.gz
opensim-SC-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.bz2
opensim-SC-0d9591bf3562955a39c57dd289d0cc0bb0ba85a3.tar.xz
Prevent the creation of duplicate inventory folders in the case of a login
database issue. Now the login will instaead fail later.
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index d560c5f..f7b286f 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -264,7 +264,7 @@ namespace OpenSim.Data.MySQL
264 { 264 {
265 database.Reconnect(); 265 database.Reconnect();
266 m_log.Error(e.ToString()); 266 m_log.Error(e.ToString());
267 return null; 267 throw;
268 } 268 }
269 } 269 }
270 270