diff options
| author | Diva Canto | 2009-09-28 17:35:26 -0700 |
|---|---|---|
| committer | Diva Canto | 2009-09-28 17:35:26 -0700 |
| commit | 51d9f7ebd4286709e75f6fcceff6fb75a4a83c46 (patch) | |
| tree | 032929778f7dc07b560c75da262f285476a44450 /OpenSim/Data/MSSQL | |
| parent | Improved the Local grid connector to fetch data from the DB when it doesn't f... (diff) | |
| parent | Convert DOS newlines to Unix newlines. (diff) | |
| download | opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.zip opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.gz opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.bz2 opensim-SC_OLD-51d9f7ebd4286709e75f6fcceff6fb75a4a83c46.tar.xz | |
Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data/MSSQL')
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs | 2 | ||||
| -rw-r--r-- | OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs index 78fc22c..099faea 100644 --- a/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs +++ b/OpenSim/Data/MSSQL/MSSQLAuthenticationData.cs | |||
| @@ -135,7 +135,7 @@ namespace OpenSim.Data.MSSQL | |||
| 135 | 135 | ||
| 136 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm); | 136 | insertBuilder.AppendFormat("insert into '{0}' ('UUID', '", m_Realm); |
| 137 | insertBuilder.Append(String.Join("', '", fields)); | 137 | insertBuilder.Append(String.Join("', '", fields)); |
| 138 | insertBuilder.Append("') values ( @principalID, @"); | 138 | insertBuilder.Append("') values (@principalID, @"); |
| 139 | insertBuilder.Append(String.Join(", @", fields)); | 139 | insertBuilder.Append(String.Join(", @", fields)); |
| 140 | insertBuilder.Append(")"); | 140 | insertBuilder.Append(")"); |
| 141 | 141 | ||
diff --git a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs index 1520888..e0c0ed6 100644 --- a/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs +++ b/OpenSim/Data/MSSQL/MSSQLUserAccountData.cs | |||
| @@ -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 | ||