diff options
| author | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2024-08-20 09:44:14 -0700 |
| commit | 68f712615f6858d66aef1d030fb18debb1a2dae4 (patch) | |
| tree | 08a0b93af46ca152d72238dffd9543af1b19ce2c /indra/llmessage | |
| parent | 9f7dd0177201fe080c287144b99a70125be1fb2b (diff) | |
| parent | 1d017b76292cf8c7afad34ec54d7401e2f1795e5 (diff) | |
Merge remote-tracking branch 'origin/release/2024.06-atlasaurus' into develop
# Conflicts:
# autobuild.xml
# indra/newview/llvoicewebrtc.cpp
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/message_string_table.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/indra/llmessage/message_string_table.cpp b/indra/llmessage/message_string_table.cpp index 6d2157eec9..084c373265 100644 --- a/indra/llmessage/message_string_table.cpp +++ b/indra/llmessage/message_string_table.cpp @@ -88,4 +88,3 @@ char* LLMessageStringTable::getString(const char *str) } return mString[hash_value]; } - |