aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data/MySQL
diff options
context:
space:
mode:
authorUbitUmarov2016-11-09 22:39:52 +0000
committerUbitUmarov2016-11-09 22:39:52 +0000
commitd1baa3e0c3b1783a68061980ffd8b9693c5a474a (patch)
tree774fb5ae0be5e9b597c46af3b3b5f3e0c6a3f0d6 /OpenSim/Data/MySQL
parentstop warning about integer division cast to float (diff)
downloadopensim-SC_OLD-d1baa3e0c3b1783a68061980ffd8b9693c5a474a.zip
opensim-SC_OLD-d1baa3e0c3b1783a68061980ffd8b9693c5a474a.tar.gz
opensim-SC_OLD-d1baa3e0c3b1783a68061980ffd8b9693c5a474a.tar.bz2
opensim-SC_OLD-d1baa3e0c3b1783a68061980ffd8b9693c5a474a.tar.xz
fix some invalid string.format arguments
Diffstat (limited to 'OpenSim/Data/MySQL')
-rw-r--r--OpenSim/Data/MySQL/MySQLXInventoryData.cs9
1 files changed, 7 insertions, 2 deletions
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index c74033e..9a0044e 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -193,7 +193,9 @@ namespace OpenSim.Data.MySQL
193 { 193 {
194 using (MySqlCommand cmd = new MySqlCommand()) 194 using (MySqlCommand cmd = new MySqlCommand())
195 { 195 {
196 cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm); 196// cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1", m_Realm);
197
198 cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags & 1");
197 199
198 cmd.Parameters.AddWithValue("?uuid", principalID.ToString()); 200 cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
199 cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture); 201 cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
@@ -212,7 +214,10 @@ namespace OpenSim.Data.MySQL
212 { 214 {
213 cmd.Connection = dbcon; 215 cmd.Connection = dbcon;
214 216
215 cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm); 217// cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
218
219 cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID");
220
216 cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString()); 221 cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
217 cmd.Parameters.AddWithValue("?AssetID", assetID.ToString()); 222 cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
218 223