diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:02:48 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-01 18:02:48 +0200 |
| commit | faf69f407fa95d9dc19f6d737f606e18ab32d052 (patch) | |
| tree | c19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/llrecentpeople.h | |
| parent | 9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff) | |
| parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) | |
Merge branch 'main' into marchcat/yz-merge
# Conflicts:
# indra/newview/llinventorygallery.cpp
Diffstat (limited to 'indra/newview/llrecentpeople.h')
| -rw-r--r-- | indra/newview/llrecentpeople.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h index 1b322f2c0a..0c04222a9f 100644 --- a/indra/newview/llrecentpeople.h +++ b/indra/newview/llrecentpeople.h @@ -106,7 +106,7 @@ public: /** * LLSimpleListener interface. */ - /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata); + /*virtual*/ bool handleEvent(LLPointer<LLOldEvents::LLEvent> event, const LLSD& userdata) override; void updateAvatarsArrivalTime(uuid_vec_t& uuids); F32 getArrivalTimeByID(const LLUUID& id); |