diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-01-26 14:45:45 -0800 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2023-02-14 17:01:22 +0100 |
| commit | 547c0665eaa19b6a2b5112faeae75e3a270b7a36 (patch) | |
| tree | 930755196559c57b629eee54129774edc7e2bfe5 /indra/newview/llgesturemgr.h | |
| parent | 4df2c0b8d67af267d3c9c6d58d63df3ed063a89e (diff) | |
DRTVWR-489-emoji: As part of the work to get macOS version of the Viewer working, the flag was introduced to warn (and therefore error out) when a virtual override was not marked with the 'override' keyword. Fixing this up involved a large number of changes and this commit represents just those changes - nothing specially from the DRTVWR-489 viewer
(Cherry pick of 3 commits from Callum to declutter the emoji PR: 3185bdea27b19e155c2ccc03c80624e113d312a6,
923733e591eb547ad5dfec395ce7d3e8f0468c16 and 6f31fabbc2d082b77c8f09bce30234ec9c506e33)
Diffstat (limited to 'indra/newview/llgesturemgr.h')
| -rw-r--r-- | indra/newview/llgesturemgr.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h index 7c8e8279c2..7bb60f00e2 100644 --- a/indra/newview/llgesturemgr.h +++ b/indra/newview/llgesturemgr.h @@ -135,7 +135,7 @@ public: void notifyObservers(); // Overriding so we can update active gesture names and notify observers - void changed(U32 mask); + void changed(U32 mask) override; BOOL matchPrefix(const std::string& in_str, std::string* out_str); @@ -150,7 +150,7 @@ protected: void runStep(LLMultiGesture* gesture, LLGestureStep* step); // LLInventoryCompletionObserver trigger - void done(); + void done() override; // Used by loadGesture static void onLoadComplete(const LLUUID& asset_uuid, |