diff options
| author | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-09-07 20:20:18 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-07 20:20:18 +0300 |
| commit | 2e886b7cfef14d087c2167e3384e9e19dcb3ff63 (patch) | |
| tree | 69c67eec8a621b04cf15f04b86b16b33baebe079 /indra/newview | |
| parent | 9ce23ccc5ea75442fd44173befdadaf6cc9d2ec2 (diff) | |
| parent | 4a00280b892ea82d2c0732ab52778a2c19bdc810 (diff) | |
Merge pull request #2521 from secondlife/andreyk/viewer_2411
viewer#2411 Use font buffer for inventory
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llfloaterimcontainer.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llfloaterimcontainer.h | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/indra/newview/llfloaterimcontainer.cpp b/indra/newview/llfloaterimcontainer.cpp index abf15ea9cf..e55bf50724 100644 --- a/indra/newview/llfloaterimcontainer.cpp +++ b/indra/newview/llfloaterimcontainer.cpp @@ -306,6 +306,9 @@ bool LLFloaterIMContainer::postBuild() mParticipantRefreshTimer.setTimerExpirySec(0); mParticipantRefreshTimer.start(); + mGeneralTitleInUse = true; // avoid reseting strings on idle + setTitle(mGeneralTitle); + return true; } @@ -521,7 +524,12 @@ void LLFloaterIMContainer::idleUpdate() // Update floater's title as required by the currently selected session or use the default title LLFloaterIMSession * conversation_floaterp = LLFloaterIMSession::findInstance(current_session->getUUID()); - setTitle(conversation_floaterp && conversation_floaterp->needsTitleOverwrite() ? conversation_floaterp->getTitle() : mGeneralTitle); + bool needs_override = conversation_floaterp && conversation_floaterp->needsTitleOverwrite(); + if (mGeneralTitleInUse == needs_override) + { + mGeneralTitleInUse = !needs_override; + setTitle(needs_override ? conversation_floaterp->getTitle() : mGeneralTitle); + } } mParticipantRefreshTimer.setTimerExpirySec(1.0f); diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index d1cfd3442c..e5486e67da 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -234,6 +234,7 @@ private: conversations_items_deque mConversationEventQueue; LLTimer mParticipantRefreshTimer; + bool mGeneralTitleInUse = true; }; #endif // LL_LLFLOATERIMCONTAINER_H |