From 998d7009a65def0a4debc9369d35b63611db5b55 Mon Sep 17 00:00:00 2001
From: Oren Hurvitz
Date: Tue, 22 Apr 2014 20:04:12 +0300
Subject: Eliminated many warnings

---
 OpenSim/Data/MSSQL/MSSQLFriendsData.cs        | 4 ++--
 OpenSim/Data/MySQL/MySQLFriendsData.cs        | 2 +-
 OpenSim/Data/MySQL/MySQLXAssetData.cs         | 2 +-
 OpenSim/Data/PGSQL/PGSQLFriendsData.cs        | 2 +-
 OpenSim/Data/SQLite/SQLiteFriendsData.cs      | 2 +-
 OpenSim/Data/SQLite/SQLiteSimulationData.cs   | 4 ++--
 OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 1 -
 7 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'OpenSim/Data')

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 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -55,7 +55,7 @@ namespace OpenSim.Data.MSSQL
             return Delete(principalID.ToString(), friend);
         }
 
-        public bool Delete(string principalID, string friend)
+        public override bool Delete(string principalID, string friend)
         {
             using (SqlConnection conn = new SqlConnection(m_ConnectionString))
             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
             return Delete(principalID.ToString(), friend);
         }
 
-        public bool Delete(string principalID, string friend)
+        public override bool Delete(string principalID, string friend)
         {
             using (MySqlCommand cmd = new MySqlCommand())
             {
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
                             cmd.ExecuteNonQuery();
                         }
                     }
-                    catch (Exception e)
+                    catch (Exception)
                     {
                         m_log.ErrorFormat(
                             "[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
         }
 
         
-        public bool Delete(string principalID, string friend)
+        public override bool Delete(string principalID, string friend)
         {
             UUID princUUID = UUID.Zero;
 
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
             return Delete(principalID.ToString(), friend);
         }
 
-        public bool Delete(string principalID, string friend)
+        public override bool Delete(string principalID, string friend)
         {
             using (SqliteCommand cmd = new SqliteCommand())
             {
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
             prim.SitName = (String)row["SitName"];
             prim.TouchName = (String)row["TouchName"];
             // permissions
-            prim.ObjectFlags = Convert.ToUInt32(row["ObjectFlags"]);
+            prim.Flags = (PrimFlags)Convert.ToUInt32(row["ObjectFlags"]);
             prim.CreatorIdentification = (String)row["CreatorID"];
             prim.OwnerID = new UUID((String)row["OwnerID"]);
             prim.GroupID = new UUID((String)row["GroupID"]);
@@ -2034,7 +2034,7 @@ namespace OpenSim.Data.SQLite
             row["SitName"] = prim.SitName;
             row["TouchName"] = prim.TouchName;
             // permissions
-            row["ObjectFlags"] = prim.ObjectFlags;
+            row["ObjectFlags"] = (uint)prim.Flags;
             row["CreatorID"] = prim.CreatorIdentification.ToString();
             row["OwnerID"] = prim.OwnerID.ToString();
             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
         private SqliteConnection m_connection;
         private string m_connectionString;
         
-        private FieldInfo[] m_Fields;
         private Dictionary<string, FieldInfo> m_FieldMap =
             new Dictionary<string, FieldInfo>();
         
-- 
cgit v1.1