Merge branch 'master' into careminster-presence-refactor
commit
f3968c4959
|
@ -130,7 +130,7 @@ namespace OpenSim.Data.MySQL
|
|||
{
|
||||
using (MySqlCommand cmd = new MySqlCommand())
|
||||
{
|
||||
cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags = 1", m_Realm);
|
||||
cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm);
|
||||
|
||||
cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
|
||||
cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
|
||||
|
|
|
@ -85,7 +85,7 @@ namespace OpenSim.Region.CoreModules.Avatar.Gestures
|
|||
item = invService.GetItem(item);
|
||||
if (item != null)
|
||||
{
|
||||
item.Flags &= ~1;
|
||||
item.Flags &= ~(uint)1;
|
||||
invService.UpdateItem(item);
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Reference in New Issue