From a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f Mon Sep 17 00:00:00 2001
From: Jeff Ames
Date: Wed, 19 Mar 2008 09:36:13 +0000
Subject: Fixed some comparisons of LLUUIDs to null. Thanks to DrSchofld for
 pointing this out.

---
 OpenSim/Framework/Communications/UserManagerBase.cs | 6 ++----
 OpenSim/Framework/RegionInfo.cs                     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

(limited to 'OpenSim/Framework')

diff --git a/OpenSim/Framework/Communications/UserManagerBase.cs b/OpenSim/Framework/Communications/UserManagerBase.cs
index d3ebbb0..5ba37e6 100644
--- a/OpenSim/Framework/Communications/UserManagerBase.cs
+++ b/OpenSim/Framework/Communications/UserManagerBase.cs
@@ -439,17 +439,15 @@ namespace OpenSim.Framework.UserManagement
                     userAgent.agentOnline = false;
                     userAgent.logoutTime = Util.UnixTimeSinceEpoch();
                     //userAgent.sessionID = LLUUID.Zero;
-                    if (regionid != null)
+                    if (regionid != LLUUID.Zero)
                     {
                         userAgent.currentRegion = regionid;
                     }
-                    userAgent.currentHandle = regionhandle;
 
+                    userAgent.currentHandle = regionhandle;
                     userAgent.currentPos = currentPos;
-
                     userProfile.currentAgent = userAgent;
 
-
                     CommitAgent(ref userProfile);
                 }
                 else
diff --git a/OpenSim/Framework/RegionInfo.cs b/OpenSim/Framework/RegionInfo.cs
index 03db1a6..76ae1ba 100644
--- a/OpenSim/Framework/RegionInfo.cs
+++ b/OpenSim/Framework/RegionInfo.cs
@@ -359,7 +359,7 @@ namespace OpenSim.Framework
 
         public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
         {
-            if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString())
+            if (MasterAvatarAssignedUUID == LLUUID.Zero)
             {
                 return true;
             }
-- 
cgit v1.1