diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2024-03-08 11:40:36 -0500 |
commit | c12a3c9f5bc085a67ef0fc2c764a9692bcab2b66 (patch) | |
tree | bad63257eacc0d137c5ea74b153cba600867e353 /indra/llmessage/llproxy.h | |
parent | efdda0b93d2dbf28e7722150028476286f0ec623 (diff) | |
parent | ee8bc528bbf97ee8cc488651fb263b07b5c1c818 (diff) |
Merge 'release/luau-scripting' into lua-leap for Emoji release.
Diffstat (limited to 'indra/llmessage/llproxy.h')
-rw-r--r-- | indra/llmessage/llproxy.h | 2 |
1 files changed, 1 insertions, 1 deletions
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. |