diff options
| author | UbitUmarov | 2017-05-23 07:35:02 +0100 |
|---|---|---|
| committer | UbitUmarov | 2017-05-23 07:35:02 +0100 |
| commit | c0bfaac0ac6873720b7c3721436ca54e93d5072c (patch) | |
| tree | 62f6b02569ba6dd968d76ad9bf2aa6ccf839d588 /OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | |
| parent | reenqueue poll events while conn is open, and not expired (diff) | |
| parent | dont log timeouts on stopped threads (diff) | |
| download | opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.zip opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.gz opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.bz2 opensim-SC-c0bfaac0ac6873720b7c3721436ca54e93d5072c.tar.xz | |
merge master
Diffstat (limited to 'OpenSim/Data/PGSQL/PGSQLXInventoryData.cs')
| -rw-r--r-- | OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs index 55a1996..4c10ac9 100644 --- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs +++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs | |||
| @@ -206,7 +206,7 @@ namespace OpenSim.Data.PGSQL | |||
| 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""::uuid = :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)); |