diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-01 10:23:56 -0500 |
commit | 1204468415dd5248bbd01d7aaede520ede3b9d36 (patch) | |
tree | b378b94ff7266ce5c7f719b3ba55c836837869e9 /indra/llinventory/llfoldertype.cpp | |
parent | 0f2248ea12713822c546e362487aa94bb29e2899 (diff) | |
parent | 1820095dd4a64c142e14869c76ae09e1e0ca6a12 (diff) |
Merge DRTVWR-489 to main on promotion of Emoji viewer (#673).
Diffstat (limited to 'indra/llinventory/llfoldertype.cpp')
-rw-r--r-- | indra/llinventory/llfoldertype.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llinventory/llfoldertype.cpp b/indra/llinventory/llfoldertype.cpp index d2c3b419ab..4856fe4619 100644 --- a/indra/llinventory/llfoldertype.cpp +++ b/indra/llinventory/llfoldertype.cpp @@ -60,7 +60,7 @@ class LLFolderDictionary : public LLSingleton<LLFolderDictionary>, { LLSINGLETON(LLFolderDictionary); protected: - virtual LLFolderType::EType notFound() const + virtual LLFolderType::EType notFound() const override { return LLFolderType::FT_NONE; } |