diff options
| author | John Hurliman | 2009-09-30 15:28:23 -0700 |
|---|---|---|
| committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
| commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
| tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |
| parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
| parent | Formatting cleanup. (diff) | |
| download | opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC_OLD-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MSSQL/MSSQLUserAccountData.cs')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index 1520888..38be9f4 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
| @@ -52,7 +52,7 @@ namespace OpenSim.Data.MSSQL | |||
| 52 | conn.Open(); | 52 | conn.Open(); |
| 53 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); | 53 | Migration m = new Migration(conn, GetType().Assembly, "UserStore"); |
| 54 | m.Update(); | 54 | m.Update(); |
| 55 | } | 55 | } |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) | 58 | public List<UserAccountData> Query(UUID principalID, UUID scopeID, string query) |
| @@ -152,7 +152,7 @@ namespace OpenSim.Data.MSSQL | |||
| 152 | StringBuilder insertBuilder = new StringBuilder(); | 152 | StringBuilder insertBuilder = new StringBuilder(); |
| 153 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm); | 153 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', 'ScopeID', '", m_Realm); |
| 154 | insertBuilder.Append(String.Join("', '", fields)); | 154 | insertBuilder.Append(String.Join("', '", fields)); |
| 155 | insertBuilder.Append("') values ( @principalID, @scopeID, @"); | 155 | insertBuilder.Append("') values (@principalID, @scopeID, @"); |
| 156 | insertBuilder.Append(String.Join(", @", fields)); | 156 | insertBuilder.Append(String.Join(", @", fields)); |
| 157 | insertBuilder.Append(")"); | 157 | insertBuilder.Append(")"); |
| 158 | 158 | ||