From 2b9e115fd72ae7a014bbd8bd2911336fa6b9993e Mon Sep 17 00:00:00 2001
From: Justin Clarke Casey
Date: Mon, 15 Sep 2008 20:50:57 +0000
Subject: * minor: eat up some yummy warnings

---
 OpenSim/Framework/Servers/BaseHttpServer.cs | 6 +++---
 OpenSim/Framework/Util.cs                   | 9 +++++----
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Servers/BaseHttpServer.cs b/OpenSim/Framework/Servers/BaseHttpServer.cs
index bde1f7e..264ffae 100644
--- a/OpenSim/Framework/Servers/BaseHttpServer.cs
+++ b/OpenSim/Framework/Servers/BaseHttpServer.cs
@@ -102,7 +102,7 @@ namespace OpenSim.Framework.Servers
             m_port = port;
             if (m_ssl)
             {
-                bool result = SetupSsl((int)sslport, CN);
+                SetupSsl((int)sslport, CN);
                 m_sslport = sslport;
             }
         }
@@ -155,7 +155,7 @@ namespace OpenSim.Framework.Servers
                             }
                             catch (Exception e)
                             {
-                                m_log.WarnFormat("[HTTPS]: Automatic HTTPS setup failed.  Do you have httpcfg.exe in your path?  If not, you can download it in the windowsXP Service Pack 2 Support Tools, here: http://www.microsoft.com/downloads/details.aspx?FamilyID=49ae8576-9bb9-4126-9761-ba8011fabf38&displaylang=en.  When you get it installed type, httpcfg {0}", httpcfgparams);
+                                m_log.WarnFormat("[HTTPS]: Automatic HTTPS setup failed.  Do you have httpcfg.exe in your path?  If not, you can download it in the windowsXP Service Pack 2 Support Tools, here: http://www.microsoft.com/downloads/details.aspx?FamilyID=49ae8576-9bb9-4126-9761-ba8011fabf38&displaylang=en.  When you get it installed type, httpcfg {0} - {1}", httpcfgparams, e);
                                 return false;
                             }
                         }
@@ -170,7 +170,7 @@ namespace OpenSim.Framework.Servers
                 }
                 catch (Exception e)
                 {
-                    m_log.WarnFormat("[HTTPS]: We didn't any certificates in your LocalMachine certificate store.  Automatic HTTPS setup failed, you may have certificate errors.  To fix this, make sure you generate a certificate request(CSR) using OpenSSL or the IIS snap-inwith the common name you specified in opensim.ini. Then get it signed by a certification authority or sign it yourself with OpenSSL and the junkCA.  Finally, be sure to import the cert to the 'MY' store(StoreLocation.LocalMachine). The configured common name is {0}", searchCN);
+                    m_log.WarnFormat("[HTTPS]: We didn't any certificates in your LocalMachine certificate store.  Automatic HTTPS setup failed, you may have certificate errors.  To fix this, make sure you generate a certificate request(CSR) using OpenSSL or the IIS snap-inwith the common name you specified in opensim.ini. Then get it signed by a certification authority or sign it yourself with OpenSSL and the junkCA.  Finally, be sure to import the cert to the 'MY' store(StoreLocation.LocalMachine). The configured common name is {0} - {1}", searchCN, e);
                     return false;
                 }
                 finally
diff --git a/OpenSim/Framework/Util.cs b/OpenSim/Framework/Util.cs
index 333ab81..ec03d25 100644
--- a/OpenSim/Framework/Util.cs
+++ b/OpenSim/Framework/Util.cs
@@ -116,10 +116,6 @@ namespace OpenSim.Framework
 
         # endregion
 
-        public Util()
-        {
-        }
-
         public static Random RandomClass
         {
             get { return randomClass; }
@@ -256,6 +252,11 @@ namespace OpenSim.Framework
             return epoch.AddSeconds(seconds);
         }
 
+        /// <summary>
+        /// Return an md5 hash of the given string
+        /// </summary>
+        /// <param name="pass"></param>
+        /// <returns></returns>
         public static string Md5Hash(string pass)
         {
             MD5 md5 = MD5CryptoServiceProvider.Create();
-- 
cgit v1.1