summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationview.cpp
diff options
context:
space:
mode:
authormberezhnoy <mberezhnoy@productengine.com>2013-04-23 18:51:54 +0300
committermberezhnoy <mberezhnoy@productengine.com>2013-04-23 18:51:54 +0300
commitfbd82229a02326e0edac6cf2f1a2c05a553f0c33 (patch)
tree425b06078f09362c4eb272cfb5b5f7d446397fee /indra/newview/llconversationview.cpp
parentdf7596e9015ea7f190d5ebb96587dd23d37bf1f8 (diff)
parent25c222e31770cb2c10e262b02ae9065521986349 (diff)
merge
Diffstat (limited to 'indra/newview/llconversationview.cpp')
-rwxr-xr-xindra/newview/llconversationview.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llconversationview.cpp b/indra/newview/llconversationview.cpp
index 911e14bcd5..42104ea20a 100755
--- a/indra/newview/llconversationview.cpp
+++ b/indra/newview/llconversationview.cpp
@@ -118,6 +118,13 @@ void LLConversationViewSession::setFlashState(bool flash_state)
mFlashTimer->stopFlashing();
}
+void LLConversationViewSession::setHighlightState(bool hihglight_state)
+{
+ mFlashStateOn = hihglight_state;
+ mFlashStarted = true;
+ mFlashTimer->stopFlashing();
+}
+
void LLConversationViewSession::startFlashing()
{
if (isInVisibleChain() && mFlashStateOn && !mFlashStarted)