aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorUbitUmarov2017-01-04 23:16:47 +0000
committerUbitUmarov2017-01-04 23:16:47 +0000
commit5da7752ebcc7fee27f9509856f2eb0db8d0263b8 (patch)
tree3d7266b1584d4c5958d5874132cd19d3d12e2116 /OpenSim/Data
parentMerge branch 'master' into httptests (diff)
parentThe robust command login reset should return config value: MinLoginLevel. Def... (diff)
downloadopensim-SC-5da7752ebcc7fee27f9509856f2eb0db8d0263b8.zip
opensim-SC-5da7752ebcc7fee27f9509856f2eb0db8d0263b8.tar.gz
opensim-SC-5da7752ebcc7fee27f9509856f2eb0db8d0263b8.tar.bz2
opensim-SC-5da7752ebcc7fee27f9509856f2eb0db8d0263b8.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/PGSQL/PGSQLXInventoryData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
index c34a8dc..959c2cf 100644
--- a/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLXInventoryData.cs
@@ -205,7 +205,7 @@ namespace OpenSim.Data.PGSQL
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"" = :PrincipalID 208 where ""avatarID""::uuid = :PrincipalID
209 and ""assetID"" = :AssetID 209 and ""assetID"" = :AssetID
210 group by ""assetID"" "); 210 group by ""assetID"" ");
211 211