Merge branch 'main' into marchcat/x-mf-merge

# Conflicts:
#	doc/contributions.txt
#	indra/newview/llfloaterimagepreview.cpp

1 files changed, 16 insertions, 3 deletions

diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp
index 9f91ecf41c..b637bcbdac 100644
--- a/indra/newview/llviewerwindow.cpp
+++ b/indra/newview/llviewerwindow.cpp
@@ -2098,13 +2098,15 @@ void LLViewerWindow::initBase()
     gFloaterView->setFloaterSnapView(main_view->getChild<LLView>("floater_snap_region")->getHandle());
     gSnapshotFloaterView = main_view->getChild<LLSnapshotFloaterView>("Snapshot Floater View");
 
+    const F32 CHAT_PERSIST_TIME = 20.f;
+
     // Console
     llassert( !gConsole );
     LLConsole::Params cp;
     cp.name("console");
     cp.max_lines(gSavedSettings.getS32("ConsoleBufferSize"));
     cp.rect(getChatConsoleRect());
-    cp.persist_time(gSavedSettings.getF32("ChatPersistTime"));
+    cp.persist_time(CHAT_PERSIST_TIME);
     cp.font_size_index(gSavedSettings.getS32("ChatFontSize"));
     cp.follows.flags(FOLLOWS_LEFT | FOLLOWS_RIGHT | FOLLOWS_BOTTOM);
     gConsole = LLUICtrlFactory::create<LLConsole>(cp);
@@ -2816,6 +2818,15 @@ BOOL LLViewerWindow::handleKeyUp(KEY key, MASK mask)
         }
     }
 
+    // Try for a new-format gesture
+    if (LLGestureMgr::instance().triggerGestureRelease(key, mask))
+    {
+        LL_DEBUGS() << "LLviewerWindow::handleKey new gesture release feature" << LL_ENDL;
+        LLViewerEventRecorder::instance().logKeyEvent(key,mask);
+        return TRUE;
+    }
+    //Old format gestures do not support this, so no need to implement it.
+
     // don't pass keys on to world when something in ui has focus
     return gFocusMgr.childHasKeyboardFocus(mRootView)
         || LLMenuGL::getKeyboardMode()
@@ -3322,11 +3333,13 @@ void LLViewerWindow::updateUI()
 
     if (gLoggedInTime.getStarted())
     {
-        if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("DestinationGuideHintTimeout"))
+        const F32 DESTINATION_GUIDE_HINT_TIMEOUT = 1200.f;
+        const F32 SIDE_PANEL_HINT_TIMEOUT = 300.f;
+        if (gLoggedInTime.getElapsedTimeF32() > DESTINATION_GUIDE_HINT_TIMEOUT)
         {
             LLFirstUse::notUsingDestinationGuide();
         }
-        if (gLoggedInTime.getElapsedTimeF32() > gSavedSettings.getF32("SidePanelHintTimeout"))
+        if (gLoggedInTime.getElapsedTimeF32() > SIDE_PANEL_HINT_TIMEOUT)
         {
             LLFirstUse::notUsingSidePanel();
         }