summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterimsession.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/llfloaterimsession.cpp')
-rw-r--r--indra/newview/llfloaterimsession.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimsession.cpp b/indra/newview/llfloaterimsession.cpp
index d36b138c21..a09dc1914f 100644
--- a/indra/newview/llfloaterimsession.cpp
+++ b/indra/newview/llfloaterimsession.cpp
@@ -70,6 +70,7 @@ LLFloaterIMSession::LLFloaterIMSession(const LLUUID& session_id)
mShouldSendTypingState(false),
mMeTyping(false),
mOtherTyping(false),
+ mSessionNameUpdatedForTyping(false),
mTypingTimer(),
mTypingTimeoutTimer(),
mPositioned(false),
@@ -556,6 +557,7 @@ void LLFloaterIMSession::updateSessionName(const std::string& name)
LLFloaterIMSessionTab::updateSessionName(name);
mTypingStart.setArg("[NAME]", name);
setTitle (mOtherTyping ? mTypingStart.getString() : name);
+ mSessionNameUpdatedForTyping = mOtherTyping;
}
}
@@ -705,7 +707,7 @@ BOOL LLFloaterIMSession::getVisible()
// getVisible() returns TRUE when Tabbed IM window is minimized.
visible = is_active && !im_container->isMinimized()
&& im_container->getVisible();
- }
+ }
}
else
{