summaryrefslogtreecommitdiff
path: root/indra/newview/llpanelpeople.cpp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2024-05-03 08:52:32 -0400
committerNat Goodspeed <nat@lindenlab.com>2024-05-03 08:52:32 -0400
commit9f620efa9dd60c5de6b7ea807d53bba922294726 (patch)
treef296457400e5edc4f50ba4a057d9fc81dcd1f5b9 /indra/newview/llpanelpeople.cpp
parent48e1979abaecc03af96e7e752e65c645083a4268 (diff)
Make LLLater store target time in mHandles; ditch 2nd unordered_map.
Instead of maintaining a whole separate unordered_map to look up target times, make room in the HandleMap entry for the target time. There's still circularity, but the split into doAtTime1() and doAtTime2() resolves it: since doAtTime2() accepts the mHandles iterator created by doAtTime1(), doAtTime2() can simply store the new mQueue handle_type into the appropriate slot. Also sprinkle in a few more override keywords for consistency.
Diffstat (limited to 'indra/newview/llpanelpeople.cpp')
-rw-r--r--indra/newview/llpanelpeople.cpp12
1 files changed, 3 insertions, 9 deletions
diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp
index ab79442f51..8efaab034b 100644
--- a/indra/newview/llpanelpeople.cpp
+++ b/indra/newview/llpanelpeople.cpp
@@ -312,11 +312,6 @@ public:
{
stop();
}
-
- bool tick() override // from LLEventTimer
- {
- return false;
- }
};
/**
@@ -353,7 +348,7 @@ public:
LLAvatarTracker::instance().removeObserver(this);
}
- /*virtual*/ void changed(U32 mask)
+ void changed(U32 mask) override
{
if (mIsActive)
{
@@ -383,8 +378,7 @@ public:
return false;
}
- // virtual
- void setActive(bool active)
+ void setActive(bool active) override
{
mIsActive = active;
if (active)
@@ -493,7 +487,7 @@ public:
setActive(false);
}
- /*virtual*/ void setActive(bool val)
+ void setActive(bool val) override
{
if (val)
{