aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework
diff options
context:
space:
mode:
authorJeff Ames2008-03-19 09:36:13 +0000
committerJeff Ames2008-03-19 09:36:13 +0000
commita0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f (patch)
treebe64babdd6f1bcb2a946d637b81739445facdd31 /OpenSim/Framework
parent* Add a large amount of extra locking to m_parts in SceneObjectGroup (diff)
downloadopensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.zip
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.gz
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.bz2
opensim-SC_OLD-a0e1be3280e4be49cf0ca8d211b97ef8c1ddee2f.tar.xz
Fixed some comparisons of LLUUIDs to null.
Thanks to DrSchofld for pointing this out.
Diffstat (limited to 'OpenSim/Framework')
-rw-r--r--OpenSim/Framework/Communications/UserManagerBase.cs6
-rw-r--r--OpenSim/Framework/RegionInfo.cs2
2 files changed, 3 insertions, 5 deletions
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
439 userAgent.agentOnline = false; 439 userAgent.agentOnline = false;
440 userAgent.logoutTime = Util.UnixTimeSinceEpoch(); 440 userAgent.logoutTime = Util.UnixTimeSinceEpoch();
441 //userAgent.sessionID = LLUUID.Zero; 441 //userAgent.sessionID = LLUUID.Zero;
442 if (regionid != null) 442 if (regionid != LLUUID.Zero)
443 { 443 {
444 userAgent.currentRegion = regionid; 444 userAgent.currentRegion = regionid;
445 } 445 }
446 userAgent.currentHandle = regionhandle;
447 446
447 userAgent.currentHandle = regionhandle;
448 userAgent.currentPos = currentPos; 448 userAgent.currentPos = currentPos;
449
450 userProfile.currentAgent = userAgent; 449 userProfile.currentAgent = userAgent;
451 450
452
453 CommitAgent(ref userProfile); 451 CommitAgent(ref userProfile);
454 } 452 }
455 else 453 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
359 359
360 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key) 360 public bool shouldMasterAvatarDetailsBeAsked(string configuration_key)
361 { 361 {
362 if (MasterAvatarAssignedUUID.Equals(null) || MasterAvatarAssignedUUID.ToString() == LLUUID.Zero.ToString()) 362 if (MasterAvatarAssignedUUID == LLUUID.Zero)
363 { 363 {
364 return true; 364 return true;
365 } 365 }