summaryrefslogtreecommitdiff
path: root/indra/llmessage/llinstantmessage.h
diff options
context:
space:
mode:
authornat-goodspeed <nat@lindenlab.com>2024-09-05 08:37:16 -0400
committerGitHub <noreply@github.com>2024-09-05 08:37:16 -0400
commit7ac4c3b56e5246fceaa73e7c9c665d3c04827d6c (patch)
treee96334bd9299102ebdaf229eec9cf4c2165f8c2f /indra/llmessage/llinstantmessage.h
parent487973d3f0ee9b8583b3d977ca6a405cba5fe518 (diff)
parent6a747e1ce027700a3609f4c377179bfa29c3ce31 (diff)
Merge pull request #2450 from secondlife/lua-merge
Merge updated 'main' branch into release/luau-scripting
Diffstat (limited to 'indra/llmessage/llinstantmessage.h')
-rw-r--r--indra/llmessage/llinstantmessage.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llinstantmessage.h b/indra/llmessage/llinstantmessage.h
index feb07c6b0f..d413e81c90 100644
--- a/indra/llmessage/llinstantmessage.h
+++ b/indra/llmessage/llinstantmessage.h
@@ -180,7 +180,7 @@ extern const S32 IM_TTL;
void pack_instant_message(
LLMessageSystem* msgsystem,
const LLUUID& from_id,
- BOOL from_group,
+ bool from_group,
const LLUUID& session_id,
const LLUUID& to_id,
const std::string& name,
@@ -198,7 +198,7 @@ void pack_instant_message(
void pack_instant_message_block(
LLMessageSystem* msgsystem,
const LLUUID& from_id,
- BOOL from_group,
+ bool from_group,
const LLUUID& session_id,
const LLUUID& to_id,
const std::string& name,