summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimcontainer.h
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2025-05-18 21:21:44 +0300
committerGitHub <noreply@github.com>2025-05-18 21:21:44 +0300
commitfdeef47611e7496ff5d5fb8f37e3b1f5240a8b14 (patch)
treeaab4b1664b82e8f49395fe3e3a75619724c9fd1c /indra/newview/llfloaterimcontainer.h
parent3569cc1993dc03637b29fcd77fe5b01b6ea372fb (diff)
parenta9c75d8136f9df6885e525ea8f2b383fe4a22593 (diff)
Merge branch 'geenz/gltf-mesh-import' into marchcat/gltf-mesh-texture-import
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
-rw-r--r--indra/newview/llfloaterimcontainer.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h
index e5486e67da..30eed8be36 100644
--- a/indra/newview/llfloaterimcontainer.h
+++ b/indra/newview/llfloaterimcontainer.h
@@ -208,7 +208,7 @@ public:
void reSelectConversation();
void updateSpeakBtnState();
static bool isConversationLoggingAllowed();
- void flashConversationItemWidget(const LLUUID& session_id, bool is_flashes);
+ void flashConversationItemWidget(const LLUUID& session_id, bool is_flashes, bool alternate_color = false);
void highlightConversationItemWidget(const LLUUID& session_id, bool is_highlighted);
bool isScrolledOutOfSight(LLConversationViewSession* conversation_item_widget);
boost::signals2::connection mMicroChangedSignal;