aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorOren Hurvitz2014-04-22 20:04:12 +0300
committerOren Hurvitz2014-04-23 16:37:36 +0300
commit998d7009a65def0a4debc9369d35b63611db5b55 (patch)
treed1303dc0387ae9ce4ddb076d5ccc856f3d5844e0 /OpenSim/Data
parentWorkaround for SRAS: if Store Asset returns 'null' then assume the asset alre... (diff)
downloadopensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.zip
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.gz
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.bz2
opensim-SC_OLD-998d7009a65def0a4debc9369d35b63611db5b55.tar.xz
Eliminated many warnings
Diffstat (limited to '')
-rw-r--r--OpenSim/Data/MSSQL/MSSQLFriendsData.cs4
-rw-r--r--OpenSim/Data/MySQL/MySQLFriendsData.cs2
-rw-r--r--OpenSim/Data/MySQL/MySQLXAssetData.cs2
-rw-r--r--OpenSim/Data/PGSQL/PGSQLFriendsData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteFriendsData.cs2
-rw-r--r--OpenSim/Data/SQLite/SQLiteSimulationData.cs4
-rw-r--r--OpenSim/Data/SQLite/SQLiteUserProfilesData.cs1
7 files changed, 8 insertions, 9 deletions
diff --git a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
index fef6978..1af2dce 100644
--- a/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLFriendsData.cs
@@ -1,4 +1,4 @@
1/* 1/*
2 * Copyright (c) Contributors, http://opensimulator.org/ 2 * Copyright (c) Contributors, http://opensimulator.org/
3 * See CONTRIBUTORS.TXT for a full list of copyright holders. 3 * See CONTRIBUTORS.TXT for a full list of copyright holders.
4 * 4 *
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MSSQL
55 return Delete(principalID.ToString(), friend); 55 return Delete(principalID.ToString(), friend);
56 } 56 }
57 57
58 public bool Delete(string principalID, string friend) 58 public override bool Delete(string principalID, string friend)
59 { 59 {
60 using (SqlConnection conn = new SqlConnection(m_ConnectionString)) 60 using (SqlConnection conn = new SqlConnection(m_ConnectionString))
61 using (SqlCommand cmd = new SqlCommand()) 61 using (SqlCommand cmd = new SqlCommand())
diff --git a/OpenSim/Data/MySQL/MySQLFriendsData.cs b/OpenSim/Data/MySQL/MySQLFriendsData.cs
index 3cd6b8f..6ba9fbd 100644
--- a/OpenSim/Data/MySQL/MySQLFriendsData.cs
+++ b/OpenSim/Data/MySQL/MySQLFriendsData.cs
@@ -47,7 +47,7 @@ namespace OpenSim.Data.MySQL
47 return Delete(principalID.ToString(), friend); 47 return Delete(principalID.ToString(), friend);
48 } 48 }
49 49
50 public bool Delete(string principalID, string friend) 50 public override bool Delete(string principalID, string friend)
51 { 51 {
52 using (MySqlCommand cmd = new MySqlCommand()) 52 using (MySqlCommand cmd = new MySqlCommand())
53 { 53 {
diff --git a/OpenSim/Data/MySQL/MySQLXAssetData.cs b/OpenSim/Data/MySQL/MySQLXAssetData.cs
index 430bb9f..8361da2 100644
--- a/OpenSim/Data/MySQL/MySQLXAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLXAssetData.cs
@@ -346,7 +346,7 @@ namespace OpenSim.Data.MySQL
346 cmd.ExecuteNonQuery(); 346 cmd.ExecuteNonQuery();
347 } 347 }
348 } 348 }
349 catch (Exception e) 349 catch (Exception)
350 { 350 {
351 m_log.ErrorFormat( 351 m_log.ErrorFormat(
352 "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}", 352 "[XASSET MYSQL DB]: Failure updating access_time for asset {0} with name {1}",
diff --git a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
index 4c1ee02..a841353 100644
--- a/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
+++ b/OpenSim/Data/PGSQL/PGSQLFriendsData.cs
@@ -51,7 +51,7 @@ namespace OpenSim.Data.PGSQL
51 } 51 }
52 52
53 53
54 public bool Delete(string principalID, string friend) 54 public override bool Delete(string principalID, string friend)
55 { 55 {
56 UUID princUUID = UUID.Zero; 56 UUID princUUID = UUID.Zero;
57 57
diff --git a/OpenSim/Data/SQLite/SQLiteFriendsData.cs b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
index cab85eb..331f426 100644
--- a/OpenSim/Data/SQLite/SQLiteFriendsData.cs
+++ b/OpenSim/Data/SQLite/SQLiteFriendsData.cs
@@ -67,7 +67,7 @@ namespace OpenSim.Data.SQLite
67 return Delete(principalID.ToString(), friend); 67 return Delete(principalID.ToString(), friend);
68 } 68 }
69 69
70 public bool Delete(string principalID, string friend) 70 public override bool Delete(string principalID, string friend)
71 { 71 {
72 using (SqliteCommand cmd = new SqliteCommand()) 72 using (SqliteCommand cmd = new SqliteCommand())
73 { 73 {
diff --git a/OpenSim/Data/SQLite/SQLiteSimulationData.cs b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
index 9466e99..a12004e 100644
--- a/OpenSim/Data/SQLite/SQLiteSimulationData.cs
+++ b/OpenSim/Data/SQLite/SQLiteSimulationData.cs
@@ -1605,7 +1605,7 @@ namespace OpenSim.Data.SQLite
1605 prim.SitName = (String)row["SitName"]; 1605 prim.SitName = (String)row["SitName"];
1606 prim.TouchName = (String)row["TouchName"]; 1606 prim.TouchName = (String)row["TouchName"];
1607 // permissions 1607 // permissions
1608 prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]); 1608 prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]);
1609 prim.CreatorIdentification = (String)row["CreatorID"]; 1609 prim.CreatorIdentification = (String)row["CreatorID"];
1610 prim.OwnerID = new UUID((String)row["OwnerID"]); 1610 prim.OwnerID = new UUID((String)row["OwnerID"]);
1611 prim.GroupID = new UUID((String)row["GroupID"]); 1611 prim.GroupID = new UUID((String)row["GroupID"]);
@@ -2034,7 +2034,7 @@ namespace OpenSim.Data.SQLite
2034 row["SitName"] = prim.SitName; 2034 row["SitName"] = prim.SitName;
2035 row["TouchName"] = prim.TouchName; 2035 row["TouchName"] = prim.TouchName;
2036 // permissions 2036 // permissions
2037 row["ObjectFlags"] = prim.ObjectFlags; 2037 row["ObjectFlags"] = (uint)prim.Flags;
2038 row["CreatorID"] = prim.CreatorIdentification.ToString(); 2038 row["CreatorID"] = prim.CreatorIdentification.ToString();
2039 row["OwnerID"] = prim.OwnerID.ToString(); 2039 row["OwnerID"] = prim.OwnerID.ToString();
2040 row["GroupID"] = prim.GroupID.ToString(); 2040 row["GroupID"] = prim.GroupID.ToString();
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
index 90d45e9..0f5b4c8 100644
--- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
+++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
@@ -50,7 +50,6 @@ namespace OpenSim.Data.SQLite
50 private SqliteConnection m_connection; 50 private SqliteConnection m_connection;
51 private string m_connectionString; 51 private string m_connectionString;
52 52
53 private FieldInfo[] m_Fields;
54 private Dictionary<string, FieldInfo> m_FieldMap = 53 private Dictionary<string, FieldInfo> m_FieldMap =
55 new Dictionary<string, FieldInfo>(); 54 new Dictionary<string, FieldInfo>();
56 55