2 files changed, 3 insertions, 3 deletions

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index 3a32ba9..cf82103 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Framework.UserManagement
                     pickerlist = plugin.Value.GeneratePickerResults(queryID, query);
 
                 }
-                catch (Exception e)
+                catch (Exception)
                 {
                     MainLog.Instance.Verbose("Unable to generate AgentPickerData via  " + plugin.Key + "(" + query + ")");
                     return new List<AvatarPickerAvatar>();
@@ -326,7 +326,7 @@ namespace OpenSim.Framework.UserManagement
                     try
                     {
                         string[] parts = startLoc.Remove(0, 4).Split('&');
-                        string region = parts[0];
+                        //string region = parts[0];
 
                         ////////////////////////////////////////////////////
                         //SimProfile SimInfo = new SimProfile();
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index cfd15fc..7ef4205 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -301,7 +301,7 @@ namespace OpenSim.Framework
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
         {
-            if (MasterAvatarAssignedUUID == null || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated())
+            if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToStringHyphenated() == LLUUID.Zero.ToStringHyphenated())
             {
                 return true;
             }