diff options
author | Erik Kundiman <erik@megapahit.org> | 2025-05-09 06:42:28 +0800 |
---|---|---|
committer | Erik Kundiman <erik@megapahit.org> | 2025-05-09 06:42:28 +0800 |
commit | c06c7e0b0eb4b7a7aaa70a3559b08b18c73aea17 (patch) | |
tree | 1a460744fcb104f56cd28af927f4cb3d2a18cdc8 /indra/newview/llconversationview.h | |
parent | 5ced1ff13ffce84e052500eb8fa898ba24bc5d93 (diff) | |
parent | 377d1b3813077619fc795f54f93b0d478cf03cbd (diff) |
Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04
Diffstat (limited to 'indra/newview/llconversationview.h')
-rw-r--r-- | indra/newview/llconversationview.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llconversationview.h b/indra/newview/llconversationview.h index 8eb6392121..a6d240ed84 100644 --- a/indra/newview/llconversationview.h +++ b/indra/newview/llconversationview.h @@ -90,7 +90,7 @@ public: virtual void refresh(); - /*virtual*/ void setFlashState(bool flash_state); + /*virtual*/ void setFlashState(bool flash_state, bool alternate_color = false); void setHighlightState(bool hihglight_state); LLFloater* getSessionFloater(); @@ -111,6 +111,7 @@ private: LLFlashTimer* mFlashTimer; bool mFlashStateOn; bool mFlashStarted; + bool mIsAltFlashColor; bool mCollapsedMode; bool mHasArrow; |