diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
| commit | 422cd237dff521b35521292a8fccca61eaece23a (patch) | |
| tree | ec275907b06d8839b2c6f984a0c7ad11719efc77 /indra/llmessage/message_prehash.h | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Fix up a couple of tiny merge conflicts after a merge with main
Diffstat (limited to 'indra/llmessage/message_prehash.h')
| -rw-r--r-- | indra/llmessage/message_prehash.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llmessage/message_prehash.h b/indra/llmessage/message_prehash.h index 3015f438b5..572dadd408 100644 --- a/indra/llmessage/message_prehash.h +++ b/indra/llmessage/message_prehash.h @@ -666,7 +666,6 @@ extern char const* const _PREHASH_GroupRolesCount; extern char const* const _PREHASH_SimulatorBlock; extern char const* const _PREHASH_GroupID; extern char const* const _PREHASH_AgentVel; -extern char const* const _PREHASH_RequestImage; extern char const* const _PREHASH_NetStats; extern char const* const _PREHASH_AgentPos; extern char const* const _PREHASH_AgentSit; @@ -1047,7 +1046,6 @@ extern char const* const _PREHASH_SortOrder; extern char const* const _PREHASH_Hunter; extern char const* const _PREHASH_SunAngVelocity; extern char const* const _PREHASH_BinaryBucket; -extern char const* const _PREHASH_ImagePacket; extern char const* const _PREHASH_StartGroupProposal; extern char const* const _PREHASH_EnergyLevel; extern char const* const _PREHASH_PriceForListing; |