diff options
| author | Callum Linden <113564339+callumlinden@users.noreply.github.com> | 2023-02-14 13:53:27 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-14 13:53:27 -0800 |
| commit | 98f0656f5c21a9469984cc8c916a1310d2fc2849 (patch) | |
| tree | 930755196559c57b629eee54129774edc7e2bfe5 /indra/llmessage | |
| parent | a92f08b2bc0ee5a63f678c55f9a9d0ec0c4ff574 (diff) | |
| parent | 3c719cc980c942bc54c6591e33a512562aa92a8b (diff) | |
Merge pull request #82 from KittyBarnett/xcode-14.1
Xcode 14.1
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. |