diff options
| author | Melanie | 2011-01-18 06:18:10 +0000 |
|---|---|---|
| committer | Melanie | 2011-01-18 06:18:10 +0000 |
| commit | f3968c49590cc1ace2a94ecc8e1fa9423d65844c (patch) | |
| tree | eb55ff50708e087424094e7a9f88af1f7858bbfa /OpenSim/Data | |
| parent | Merge branch 'master' into careminster-presence-refactor (diff) | |
| parent | Fix build break (diff) | |
| download | opensim-SC-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.zip opensim-SC-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.gz opensim-SC-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.bz2 opensim-SC-f3968c49590cc1ace2a94ecc8e1fa9423d65844c.tar.xz | |
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLXInventoryData.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs index 3c73095..287c4dd 100644 --- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs +++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs | |||
| @@ -130,7 +130,7 @@ namespace OpenSim.Data.MySQL | |||
| 130 | { | 130 | { |
| 131 | using (MySqlCommand cmd = new MySqlCommand()) | 131 | using (MySqlCommand cmd = new MySqlCommand()) |
| 132 | { | 132 | { |
| 133 | cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags = 1", m_Realm); | 133 | cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm); |
| 134 | 134 | ||
| 135 | cmd.Parameters.AddWithValue("?uuid", principalID.ToString()); | 135 | cmd.Parameters.AddWithValue("?uuid", principalID.ToString()); |
| 136 | cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture); | 136 | cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture); |