diff options
author | John Hurliman | 2009-10-19 15:19:37 -0700 |
---|---|---|
committer | John Hurliman | 2009-10-19 15:19:37 -0700 |
commit | bd03cbd8156e2044eed89ba2774bab43b9931aa1 (patch) | |
tree | c6dc15d4028b2d103b89296ac68b84482b77f5e8 /OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |
parent | * Change Util.FireAndForget to use ThreadPool.UnsafeQueueUserWorkItem(). This... (diff) | |
parent | Minor formatting cleanup. (diff) | |
download | opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.zip opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.gz opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.bz2 opensim-SC-bd03cbd8156e2044eed89ba2774bab43b9931aa1.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into prioritization
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index 7b6e7c8..2d92cb1 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
@@ -54,7 +54,7 @@ namespace OpenSim.Data.MSSQL | |||
54 | conn.Open(); | 54 | conn.Open(); |
55 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); | 55 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); |
56 | m.Update(); | 56 | m.Update(); |
57 | } | 57 | } |
58 | } | 58 | } |
59 | 59 | ||
60 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) | 60 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) |
@@ -134,7 +134,7 @@ namespace OpenSim.Data.MSSQL | |||
134 | updateBuilder.AppendFormat("{0} = @{0}", field); | 134 | updateBuilder.AppendFormat("{0} = @{0}", field); |
135 | 135 | ||
136 | first = false; | 136 | first = false; |
137 | cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); | 137 | cmd.Parameters.Add(m_database.CreateParameter("@" + field, data.Data[field])); |
138 | } | 138 | } |
139 | 139 | ||
140 | updateBuilder.Append(" where UUID = @principalID"); | 140 | updateBuilder.Append(" where UUID = @principalID"); |
@@ -153,7 +153,7 @@ namespace OpenSim.Data.MSSQL | |||
153 | StringBuilder insertBuilder = new StringBuilder(); | 153 | StringBuilder insertBuilder = new StringBuilder(); |
154 | insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm); | 154 | insertBuilder.AppendFormat("insert into {0} (UUID, ScopeID, ", m_Realm); |
155 | insertBuilder.Append(String.Join(", ", fields)); | 155 | insertBuilder.Append(String.Join(", ", fields)); |
156 | insertBuilder.Append(") values ( @principalID, @scopeID, @"); | 156 | insertBuilder.Append(") values (@principalID, @scopeID, @"); |
157 | insertBuilder.Append(String.Join(", @", fields)); | 157 | insertBuilder.Append(String.Join(", @", fields)); |
158 | insertBuilder.Append(")"); | 158 | insertBuilder.Append(")"); |
159 | 159 | ||