From 748f72326d9a295958bc9ba63bbb1a5d39030ef7 Mon Sep 17 00:00:00 2001
From: Dr Scofield
Date: Fri, 27 Jun 2008 23:03:39 +0000
Subject: last round of warning squashing. calling it a day now.

---
 OpenSim/Data/NHibernate/NHibernateAssetData.cs     | 24 +++++++++++-----------
 OpenSim/Data/NHibernate/NHibernateInventoryData.cs |  2 +-
 OpenSim/Data/NHibernate/NHibernateManager.cs       |  8 ++++----
 OpenSim/Data/NHibernate/NHibernateUserData.cs      | 12 +++++------
 4 files changed, 23 insertions(+), 23 deletions(-)

(limited to 'OpenSim/Data/NHibernate')

diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index a339ee3..174667e 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -137,18 +137,18 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
-        private void LogAssetLoad(AssetBase asset)
-        {
-            string temporary = asset.Temporary ? "Temporary" : "Stored";
-            string local = asset.Local ? "Local" : "Remote";
-
-            int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
-
-            m_log.Info("[SQLITE]: " +
-                                     string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
-                                                   asset.FullID, asset.Name, asset.Description, asset.Type,
-                                                   asset.InvType, temporary, local, assetLength));
-        }
+        // private void LogAssetLoad(AssetBase asset)
+        // {
+        //     string temporary = asset.Temporary ? "Temporary" : "Stored";
+        //     string local = asset.Local ? "Local" : "Remote";
+
+        //     int assetLength = (asset.Data != null) ? asset.Data.Length : 0;
+
+        //     m_log.Info("[SQLITE]: " +
+        //                              string.Format("Loaded {6} {5} Asset: [{0}][{3}/{4}] \"{1}\":{2} ({7} bytes)",
+        //                                            asset.FullID, asset.Name, asset.Description, asset.Type,
+        //                                            asset.InvType, temporary, local, assetLength));
+        // }
 
         override public bool ExistsAsset(LLUUID uuid)
         {
diff --git a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
index 46dcbad..153d2d5 100644
--- a/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateInventoryData.cs
@@ -277,7 +277,7 @@ namespace OpenSim.Data.NHibernate
         public string getVersion()
         {
             Module module = GetType().Module;
-            string dllName = module.Assembly.ManifestModule.Name;
+            // string dllName = module.Assembly.ManifestModule.Name;
             Version dllVersion = module.Assembly.GetName().Version;
 
 
diff --git a/OpenSim/Data/NHibernate/NHibernateManager.cs b/OpenSim/Data/NHibernate/NHibernateManager.cs
index 6f13294..4c5ec01 100644
--- a/OpenSim/Data/NHibernate/NHibernateManager.cs
+++ b/OpenSim/Data/NHibernate/NHibernateManager.cs
@@ -33,11 +33,11 @@ namespace OpenSim.Data.NHibernate
 {
     internal class NHibernateManager
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        // private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        private ISessionFactory factory;
-        private ISession session;
-        private ITransaction transaction;
+        // private ISessionFactory factory;
+        // private ISession session;
+        // private ITransaction transaction;
 
         public NHibernateManager()
         {
diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 9cb576d..9d9aec9 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -91,7 +91,7 @@ namespace OpenSim.Data.NHibernate
             {
                 user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
             }
-            catch (ObjectNotFoundException e) 
+            catch (ObjectNotFoundException) 
             {
                 user = null;
             }
@@ -108,7 +108,7 @@ namespace OpenSim.Data.NHibernate
                 user = session.Load(typeof(UserProfileData), uuid) as UserProfileData;
                 user.CurrentAgent = GetAgentByUUID(uuid);
             } 
-            catch (ObjectNotFoundException e) 
+            catch (ObjectNotFoundException) 
             {
                 user = null;
             }
@@ -143,7 +143,7 @@ namespace OpenSim.Data.NHibernate
                     UserAgentData old = session.Load(typeof(UserAgentData), uuid) as UserAgentData;
                     session.Delete(old);
                 }
-                catch (ObjectNotFoundException e) 
+                catch (ObjectNotFoundException) 
                 {
                 }
                 session.Save(agent);
@@ -173,7 +173,7 @@ namespace OpenSim.Data.NHibernate
                 UserAgentData old = session.Load(typeof(UserAgentData), agent.ProfileID) as UserAgentData;
                 session.Delete(old);
             }
-            catch (ObjectNotFoundException e) 
+            catch (ObjectNotFoundException) 
             {
             }
             session.Save(agent);
@@ -260,7 +260,7 @@ namespace OpenSim.Data.NHibernate
             // TODO: I'm sure I'll have to do something silly here
             try {
                 appearance = session.Load(typeof(AvatarAppearance), user) as AvatarAppearance;
-            } catch (ObjectNotFoundException e) {
+            } catch (ObjectNotFoundException) {
                 appearance = null;
             }
             return appearance;
@@ -271,7 +271,7 @@ namespace OpenSim.Data.NHibernate
             AvatarAppearance appearance;
             try {
                 appearance = session.Load(typeof(AvatarAppearance), uuid) as AvatarAppearance;
-            } catch (ObjectNotFoundException e) {
+            } catch (ObjectNotFoundException) {
                 appearance = null;
             }
 
-- 
cgit v1.1