Merge branch 'master' into careminster-presence-refactor

2 files changed, 5 insertions, 6 deletions

diff --git a/OpenSim/Services/GridService/GridService.cs b/OpenSim/Services/GridService/GridService.cs
index 1368e46..2faf018 100644
--- a/OpenSim/Services/GridService/GridService.cs
+++ b/OpenSim/Services/GridService/GridService.cs
@@ -123,8 +123,7 @@ namespace OpenSim.Services.GridService
                 if ((rflags & OpenSim.Data.RegionFlags.Reservation) != 0)
                 {
                     // Regions reserved for the null key cannot be taken.
-                    //
-                    if (region.Data["PrincipalID"] == UUID.Zero.ToString())
+                    if ((string)region.Data["PrincipalID"] == UUID.Zero.ToString())
                         return "Region location us reserved";
 
                     // Treat it as an auth request
@@ -132,7 +131,6 @@ namespace OpenSim.Services.GridService
                     // NOTE: Fudging the flags value here, so these flags
                     //       should not be used elsewhere. Don't optimize
                     //       this with the later retrieval of the same flags!
-                    //
                     rflags |= OpenSim.Data.RegionFlags.Authenticate;
                 }
 
@@ -489,7 +487,7 @@ namespace OpenSim.Services.GridService
                         f |= (OpenSim.Data.RegionFlags)val;
                     }
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     MainConsole.Instance.Output("Error in flag specification: " + p);
                 }
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index de5df9d..58746d0 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -168,10 +168,11 @@ namespace OpenSim.Services.GridService
             }
 
             // Sanity check. 
-            IPAddress ipaddr = null;
+            //IPAddress ipaddr = null;
             try
             {
-                ipaddr = Util.GetHostFromDNS(host);
+                //ipaddr = Util.GetHostFromDNS(host);
+                Util.GetHostFromDNS(host);
             }
             catch 
             {