aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorMelanie2011-01-18 00:55:08 +0100
committerMelanie2011-01-18 01:26:42 +0000
commit75644e0f6e08e5b5866af3a44afcf1308b9513f1 (patch)
tree4f8c4fc936a051a975dff449aec1e562c65034c1
parentChange gesture activation to not quash any other flags (diff)
downloadopensim-SC_OLD-75644e0f6e08e5b5866af3a44afcf1308b9513f1.zip
opensim-SC_OLD-75644e0f6e08e5b5866af3a44afcf1308b9513f1.tar.gz
opensim-SC_OLD-75644e0f6e08e5b5866af3a44afcf1308b9513f1.tar.bz2
opensim-SC_OLD-75644e0f6e08e5b5866af3a44afcf1308b9513f1.tar.xz
Prevent activation and deactivation of gestures from clobbering the slam
bits
-rw-r--r--OpenSim/Data/MySQL/MySQLInventoryData.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Data/MySQL/MySQLInventoryData.cs b/OpenSim/Data/MySQL/MySQLInventoryData.cs
index 2dca3eb..9d70acb 100644
--- a/OpenSim/Data/MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLInventoryData.cs
@@ -867,7 +867,7 @@ namespace OpenSim.Data.MySQL
867 dbcon.Open(); 867 dbcon.Open();
868 868
869 using (MySqlCommand sqlCmd = new MySqlCommand( 869 using (MySqlCommand sqlCmd = new MySqlCommand(
870 "SELECT * FROM inventoryitems WHERE avatarId = ?uuid AND assetType = ?type and flags = 1", dbcon)) 870 "SELECT * FROM inventoryitems WHERE avatarId = ?uuid AND assetType = ?type and flags & 1", dbcon))
871 { 871 {
872 sqlCmd.Parameters.AddWithValue("?uuid", avatarID.ToString()); 872 sqlCmd.Parameters.AddWithValue("?uuid", avatarID.ToString());
873 sqlCmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture); 873 sqlCmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);