diff options
author | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:12:00 -0800 |
---|---|---|
committer | Brad Linden <brad@lindenlab.com> | 2024-03-01 10:12:00 -0800 |
commit | 258c039584dd293ba7218dc522882bc0bac25e63 (patch) | |
tree | a695d32a5fff74828d281f04186039e08287566a /indra/llmessage | |
parent | 23d44cb6653ee4ca46ec0e33f19b393b58f5332f (diff) | |
parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) |
Merge remote-tracking branch 'origin/main' into release/gltf-maint2
Diffstat (limited to 'indra/llmessage')
-rw-r--r-- | indra/llmessage/llexperiencecache.h | 2 | ||||
-rw-r--r-- | indra/llmessage/llproxy.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llexperiencecache.h b/indra/llmessage/llexperiencecache.h index 1c97133723..8be4c64dfc 100644 --- a/indra/llmessage/llexperiencecache.h +++ b/indra/llmessage/llexperiencecache.h @@ -106,7 +106,7 @@ public: private: virtual ~LLExperienceCache(); - virtual void initSingleton(); + virtual void initSingleton() override; typedef boost::function<LLSD(LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t &, LLCore::HttpRequest::ptr_t, std::string)> permissionInvoker_fn; diff --git a/indra/llmessage/llproxy.h b/indra/llmessage/llproxy.h index 25f6977e14..8a64cdbfaa 100644 --- a/indra/llmessage/llproxy.h +++ b/indra/llmessage/llproxy.h @@ -226,7 +226,7 @@ class LLProxy: public LLSingleton<LLProxy> LLSINGLETON(LLProxy); LOG_CLASS(LLProxy); - /*virtual*/ void initSingleton(); + /*virtual*/ void initSingleton() override; public: // Static check for enabled status for UDP packets. Call from main thread only. |