diff options
| author | UbitUmarov | 2017-01-05 19:32:57 +0000 |
|---|---|---|
| committer | UbitUmarov | 2017-01-05 19:32:57 +0000 |
| commit | 254b26a7d51143d4e08229fa0b0fceabd76a41d0 (patch) | |
| tree | 8ed65006e5dc04e69ceba67e31075a9e505e64f6 /OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | |
| parent | Merge branch 'master' into httptests (diff) | |
| parent | Massive tab and trailing space cleanup (diff) | |
| download | opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.zip opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.gz opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.bz2 opensim-SC-254b26a7d51143d4e08229fa0b0fceabd76a41d0.tar.xz | |
fix merge
Diffstat (limited to '')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs index 959c2cf..55a1996 100644 --- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs +++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | |||
| @@ -197,16 +197,16 @@ namespace OpenSim.Data.PGSQL | |||
| 197 | using (NpgsqlCommand cmd = new NpgsqlCommand()) | 197 | using (NpgsqlCommand cmd = new NpgsqlCommand()) |
| 198 | { | 198 | { |
| 199 | /* | 199 | /* |
| 200 | cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" | 200 | cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" |
| 201 | from inventoryitems | 201 | from inventoryitems |
| 202 | where ""avatarID"" = :PrincipalID | 202 | where ""avatarID"" = :PrincipalID |
| 203 | and ""assetID"" = :AssetID | 203 | and ""assetID"" = :AssetID |
| 204 | group by ""assetID"" ", m_Realm); | 204 | group by ""assetID"" ", m_Realm); |
| 205 | */ | 205 | */ |
| 206 | cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" | 206 | cmd.CommandText = String.Format(@"select bit_or(""inventoryCurrentPermissions"") as ""inventoryCurrentPermissions"" |
| 207 | from inventoryitems | 207 | from inventoryitems |
| 208 | where ""avatarID""::uuid = :PrincipalID | 208 | where ""avatarID""::uuid = :PrincipalID |
| 209 | and ""assetID"" = :AssetID | 209 | and ""assetID"" = :AssetID |
| 210 | group by ""assetID"" "); | 210 | group by ""assetID"" "); |
| 211 | 211 | ||
| 212 | cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID)); | 212 | cmd.Parameters.Add(m_database.CreateParameter("PrincipalID", principalID)); |