summaryrefslogtreecommitdiff
path: root/indra/llmessage/llproxy.h
diff options
context:
space:
mode:
authorKitty Barnett <develop@catznip.com>2023-02-08 14:52:16 +0100
committerKitty Barnett <develop@catznip.com>2023-02-08 14:52:16 +0100
commit5805bbd8104e66fb9ae7ed3c22e374e377b2f2e1 (patch)
treeaeea23255f4717f57012d5d42075659ecff6c76a /indra/llmessage/llproxy.h
parentda0335c864477036ba996fbab4db2194535466d7 (diff)
parentb2f890408e2dc63a0f842273c41c0efed770cb9a (diff)
Merge branch 'DRTVWR-489-emoji' of https://github.com/secondlife/viewer into DRTVWR-489-emoji
Diffstat (limited to 'indra/llmessage/llproxy.h')
-rw-r--r--indra/llmessage/llproxy.h2
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.