diff options
author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-16 19:05:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2025-05-16 19:05:57 -0400 |
commit | bb76eae4b814e612ff2b0c62fffc6c3263058d64 (patch) | |
tree | 32818e0c938b465bf39c976955864a14b3bb512e /indra/newview/llfloaterimcontainer.cpp | |
parent | 2efe514f14a0f0b405599301a14413edfce873ee (diff) | |
parent | d5313e7161bb99045adc4a1a34d7f85de609d97b (diff) |
Merge branch 'release/2025.04' into geenz/gltf-mesh-import
Diffstat (limited to 'indra/newview/llfloaterimcontainer.cpp')
-rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index e4b14d8df6..72d4d30dcf 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -2302,14 +2302,14 @@ bool LLFloaterIMContainer::isConversationLoggingAllowed() return gSavedPerAccountSettings.getS32("KeepConversationLogTranscripts") > 0; } -void LLFloaterIMContainer::flashConversationItemWidget(const LLUUID& session_id, bool is_flashes) +void LLFloaterIMContainer::flashConversationItemWidget(const LLUUID& session_id, bool is_flashes, bool alternate_color) { //Finds the conversation line item to flash using the session_id LLConversationViewSession * widget = dynamic_cast<LLConversationViewSession *>(get_ptr_in_map(mConversationsWidgets,session_id)); if (widget) { - widget->setFlashState(is_flashes); + widget->setFlashState(is_flashes, alternate_color); } } |