4 files changed, 8 insertions, 6 deletions

diff --git a/OpenSim/Data/NHibernate/NHibernateUserData.cs b/OpenSim/Data/NHibernate/NHibernateUserData.cs
index 6076f90..5c5cc92 100644
--- a/OpenSim/Data/NHibernate/NHibernateUserData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateUserData.cs
@@ -118,6 +118,7 @@ namespace OpenSim.Data.NHibernate
             }
         }
 
+        /*
         private void SetAgentData(UUID uuid, UserAgentData agent)
         {
             UserAgentData old = (UserAgentData)manager.Load(typeof(UserAgentData), uuid);
@@ -131,8 +132,9 @@ namespace OpenSim.Data.NHibernate
                 m_log.InfoFormat("[NHIBERNATE] SetAgentData: {0} ", agent.ProfileID);
                 manager.Save(agent);
             }
-
         }
+        */
+        
         override public bool UpdateUserProfile(UserProfileData profile)
         {
             if (ExistsUser(profile.ID))
diff --git a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
index 8111add..ffa3c5f 100644
--- a/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
+++ b/OpenSim/Framework/Communications/Tests/LoginServiceTests.cs
@@ -212,7 +212,7 @@ namespace OpenSim.Framework.Communications.Tests
                                          "If this is not the case please wait for your session to timeout. " +
                                          "If this takes longer than a few minutes please contact the grid owner. " +
                                          "Please wait 5 minutes if you are going to connect to a region nearby to the region you were at previously.";
-            string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again.";
+            //string error_region_unavailable = "The region you are attempting to log into is not responding. Please select another region and try again.";
             // 2.1) Test for wrong user name
             loginParams = new Hashtable();
             loginParams["first"] = lastName;
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 057f021..a0e5ba5 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -199,7 +199,7 @@ namespace OpenSim.Framework
         public bool isSandbox = false;
         private EstateSettings m_estateSettings;
         private RegionSettings m_regionSettings;
-        private IConfigSource m_configSource = null;
+        //private IConfigSource m_configSource = null;
 
         public UUID MasterAvatarAssignedUUID = UUID.Zero;
         public string MasterAvatarFirstName = String.Empty;
@@ -227,7 +227,7 @@ namespace OpenSim.Framework
 
         public RegionInfo(string description, string filename, bool skipConsoleConfig, IConfigSource configSource)
         {
-            m_configSource = configSource;
+            //m_configSource = configSource;
             configMember =
                 new ConfigurationMember(filename, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
             configMember.performConfigurationRetrieve();
@@ -236,7 +236,7 @@ namespace OpenSim.Framework
 
         public RegionInfo(string description, XmlNode xmlNode, bool skipConsoleConfig, IConfigSource configSource)
         {
-            m_configSource = configSource;
+            //m_configSource = configSource;
             configMember =
                 new ConfigurationMember(xmlNode, description, loadConfigurationOptions, handleIncomingConfiguration, !skipConsoleConfig);
             configMember.performConfigurationRetrieve();
diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index 09adc11..d69b2c0 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -1566,7 +1566,7 @@ namespace OpenSim.Framework.Servers
     /// There is also a UseTraceLogs line in this file that can be uncommented for more detailed log information
     public class HttpServerLogWriter : HttpServer.ILogWriter
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
+        //private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
         public void Write(object source, HttpServer.LogPrio priority, string message)
         {