diff options
author | Jeff Ames | 2008-05-25 23:27:38 +0000 |
---|---|---|
committer | Jeff Ames | 2008-05-25 23:27:38 +0000 |
commit | 5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d (patch) | |
tree | b010c015ac515fe2a3dd0c9f89c16cbc6383d685 /OpenSim/Data | |
parent | * A hacky Top Scripts display. It isn't accurate as far as ms accounting, ho... (diff) | |
download | opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.zip opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.gz opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.bz2 opensim-SC-5d77625e9ac4ce1fc7b8fd67aabf563678ef0d5d.tar.xz |
Update svn properties. Formatting cleanup.
Diffstat (limited to 'OpenSim/Data')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 14 |
1 files changed, 8 insertions, 6 deletions
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 | |||
95 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; | 95 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; |
96 | 96 | ||
97 | database = new MySQLManager(m_connectString); | 97 | database = new MySQLManager(m_connectString); |
98 | } else { | 98 | } |
99 | else | ||
100 | { | ||
99 | m_connectString = connect; | 101 | m_connectString = connect; |
100 | m_agentsTableName = "agents"; | 102 | m_agentsTableName = "agents"; |
101 | m_usersTableName = "users"; | 103 | m_usersTableName = "users"; |
@@ -190,7 +192,7 @@ namespace OpenSim.Data.MySQL | |||
190 | { | 192 | { |
191 | database.ExecuteResourceSql("CreateAvatarAppearance.sql"); | 193 | database.ExecuteResourceSql("CreateAvatarAppearance.sql"); |
192 | return; | 194 | return; |
193 | } | 195 | } |
194 | else if (oldVersion.Contains("Rev.1")) | 196 | else if (oldVersion.Contains("Rev.1")) |
195 | { | 197 | { |
196 | database.ExecuteSql("drop table avatarappearance"); | 198 | database.ExecuteSql("drop table avatarappearance"); |
@@ -674,15 +676,15 @@ namespace OpenSim.Data.MySQL | |||
674 | { | 676 | { |
675 | Dictionary<string, string> param = new Dictionary<string, string>(); | 677 | Dictionary<string, string> param = new Dictionary<string, string>(); |
676 | param["?owner"] = user.ToString(); | 678 | param["?owner"] = user.ToString(); |
677 | 679 | ||
678 | IDbCommand result = database.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param); | 680 | IDbCommand result = database.Query("SELECT * FROM " + m_appearanceTableName + " WHERE owner = ?owner", param); |
679 | IDataReader reader = result.ExecuteReader(); | 681 | IDataReader reader = result.ExecuteReader(); |
680 | 682 | ||
681 | AvatarAppearance appearance = database.readAppearanceRow(reader); | 683 | AvatarAppearance appearance = database.readAppearanceRow(reader); |
682 | 684 | ||
683 | reader.Close(); | 685 | reader.Close(); |
684 | result.Dispose(); | 686 | result.Dispose(); |
685 | 687 | ||
686 | return appearance; | 688 | return appearance; |
687 | } | 689 | } |
688 | } | 690 | } |