From c8977fd904df10f225915ac5527d279440356257 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Thu, 29 Apr 2021 17:38:15 +0300 Subject: SL-15177 Fix the way of counting for gTextureTimer --- indra/newview/llappviewer.cpp | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 5a64f5e01c..1ffb3777cb 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4856,6 +4856,10 @@ void LLAppViewer::idle() // // Special case idle if still starting up // + if (LLStartUp::getStartupState() >= STATE_WORLD_INIT) + { + update_texture_time(); + } if (LLStartUp::getStartupState() < STATE_STARTED) { // Skip rest if idle startup returns false (essentially, no world yet) -- cgit v1.2.3 From fc4cb1ad63944d7324e8c407cf544a2b3cc27895 Mon Sep 17 00:00:00 2001 From: Mnikolenko Productengine Date: Mon, 9 Aug 2021 19:51:44 +0300 Subject: SL-15773 Don't try to remove breakpad minidump if it's not needed --- indra/newview/llappviewer.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 8c210b668b..eb27162719 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -1735,12 +1735,14 @@ bool LLAppViewer::cleanup() // one because it happens just after mFastTimerLogThread is deleted. This // comment is in case we guessed wrong, so we can move it here instead. +#if LL_LINUX // remove any old breakpad minidump files from the log directory if (! isError()) { std::string logdir = gDirUtilp->getExpandedFilename(LL_PATH_LOGS, ""); gDirUtilp->deleteFilesInDir(logdir, "*-*-*-*-*.dmp"); } +#endif // Kill off LLLeap objects. We can find them all because LLLeap is derived // from LLInstanceTracker. -- cgit v1.2.3 From ba72dc830b5f51991be6f7bfc308606c4d31431d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Fri, 17 Sep 2021 23:18:58 +0300 Subject: SL-11841 Fix PushToTalkToggle being set incorectly Due to changed defaults, legacy compatibility will no longer work corectly, remove it --- indra/newview/llappviewer.cpp | 24 ------------------------ 1 file changed, 24 deletions(-) (limited to 'indra/newview/llappviewer.cpp') diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index eb27162719..e51cefed63 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -4513,11 +4513,6 @@ void LLAppViewer::loadKeyBindings() LLKeyboard::keyFromString(key_string, &key); } - value = gSavedSettings.getBOOL("PushToTalkToggle"); - std::string control_name = value ? "toggle_voice" : "voice_follow_key"; - third_person_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - sitting_view.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - if (third_person_view.hasUnsavedChanges()) { // calls loadBindingsXML() @@ -4529,25 +4524,6 @@ void LLAppViewer::loadKeyBindings() // calls loadBindingsXML() sitting_view.saveToSettings(); } - - // in case of voice we need to repeat this in other modes - - for (U32 i = 0; i < LLKeyConflictHandler::MODE_COUNT - 1; ++i) - { - // edit and first person modes; MODE_SAVED_SETTINGS not in use at the moment - if (i != LLKeyConflictHandler::MODE_THIRD_PERSON && i != LLKeyConflictHandler::MODE_SITTING) - { - LLKeyConflictHandler handler((LLKeyConflictHandler::ESourceMode)i); - - handler.registerControl(control_name, 0, mouse, key, MASK_NONE, true); - - if (handler.hasUnsavedChanges()) - { - // calls loadBindingsXML() - handler.saveToSettings(); - } - } - } } // since something might have gone wrong or there might have been nothing to save // (and because otherwise following code will have to be encased in else{}), -- cgit v1.2.3