aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim
diff options
context:
space:
mode:
authorMelanie2011-01-18 00:55:08 +0100
committerMelanie2011-01-18 00:55:08 +0100
commit4f8ba53f86281484963124bc9900e8bb9d388fbe (patch)
tree5488a830ae377f617dc4401950766d3d946e9440 /OpenSim
parentChange gesture activation to not quash any other flags (diff)
downloadopensim-SC_OLD-4f8ba53f86281484963124bc9900e8bb9d388fbe.zip
opensim-SC_OLD-4f8ba53f86281484963124bc9900e8bb9d388fbe.tar.gz
opensim-SC_OLD-4f8ba53f86281484963124bc9900e8bb9d388fbe.tar.bz2
opensim-SC_OLD-4f8ba53f86281484963124bc9900e8bb9d388fbe.tar.xz
Prevent activation and deactivation of gestures from clobbering the slam
bits
Diffstat (limited to 'OpenSim')
-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);