From 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Sun, 25 May 2008 23:27:38 +0000 Subject: Update svn properties. Formatting cleanup. --- OpenSim/Data/MySQL/MySQLUserData.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'OpenSim/Data') diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index 745583f..bcfd7c3 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs @@ -95,7 +95,9 @@ namespace OpenSim.Data.MySQL settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; database = new MySQLManager(m_connectString); - } else { + } + else + { m_connectString = connect; m_agentsTableName = "agents"; m_usersTableName = "users"; @@ -190,7 +192,7 @@ namespace OpenSim.Data.MySQL { database.ExecuteResourceSql("CreateAvatarAppearance.sql"); return; - } + } else if (oldVersion.Contains("Rev.1")) { database.ExecuteSql("drop table avatarappearance"); @@ -674,15 +676,15 @@ namespace OpenSim.Data.MySQL { Dictionary param = new Dictionary(); param["?owner"] = user.ToString(); - + IDbCommand result = database.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param); IDataReader reader = result.ExecuteReader(); - + AvatarAppearance appearance = database.readAppearanceRow(reader); - + reader.Close(); result.Dispose(); - + return appearance; } } -- cgit v1.1