summaryrefslogtreecommitdiff
path: root/indra/llmessage/llinstantmessage.cpp
diff options
context:
space:
mode:
authorRunitaiLinden <davep@lindenlab.com>2024-05-06 16:48:58 -0500
committerRunitaiLinden <davep@lindenlab.com>2024-05-06 16:48:58 -0500
commitc6d752b880cacca8fb8f10f28790a50161fcb9ab (patch)
tree14910a69597962134f2e78e864a2f05962a16356 /indra/llmessage/llinstantmessage.cpp
parent76101843c0d390c25a783f212eb1ea75e508ada4 (diff)
parent7d87e41bbd5d4761b1eb17e49b7a00b948d84213 (diff)
Merge remote-tracking branch 'origin/DRTVWR-600-maint-A' into gltf-dev-maint-a-merge
Diffstat (limited to 'indra/llmessage/llinstantmessage.cpp')
-rw-r--r--indra/llmessage/llinstantmessage.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llinstantmessage.cpp b/indra/llmessage/llinstantmessage.cpp
index dd5a655d7e..52102e55c8 100644
--- a/indra/llmessage/llinstantmessage.cpp
+++ b/indra/llmessage/llinstantmessage.cpp
@@ -54,7 +54,7 @@ const S32 IM_TTL = 1;
void pack_instant_message(
LLMessageSystem* msg,
const LLUUID& from_id,
- BOOL from_group,
+ bool from_group,
const LLUUID& session_id,
const LLUUID& to_id,
const std::string& name,
@@ -93,7 +93,7 @@ void pack_instant_message(
void pack_instant_message_block(
LLMessageSystem* msg,
const LLUUID& from_id,
- BOOL from_group,
+ bool from_group,
const LLUUID& session_id,
const LLUUID& to_id,
const std::string& name,