diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2007-05-30 17:39:09 +0000 |
| commit | 3e9872a297c3cf3f929e688e0e89a78f6bc050f5 (patch) | |
| tree | ab3877f764cc27dbdca0b683f07e6ea3a3ac8a23 /indra/newview/llviewerwindow.cpp | |
| parent | 7b61f1d0ec30e97fd3b7c5caf4b0e675c6e9a1f5 (diff) | |
merge -r61423:62602 svn/branches/maintenance --> release
Diffstat (limited to 'indra/newview/llviewerwindow.cpp')
| -rw-r--r-- | indra/newview/llviewerwindow.cpp | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index a9ed98e9db..682490440c 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -1559,8 +1559,6 @@ LLViewerWindow::LLViewerWindow( // Can't have spaces in settings.ini strings, so use underscores instead and convert them. LLString::replaceChar(mOverlayTitle, '_', ' '); - gAwayTimer.stop(); - LLAlertDialog::setDisplayCallback(alertCallback); // call this before calling any modal dialogs // sync the keyboard's setting with the saved setting @@ -1857,6 +1855,7 @@ void LLViewerWindow::initWorldUI() gIMView = new LLIMView("gIMView", LLRect() ); gIMView->setFollowsAll(); + mRootView->addChild(gIMView); LLRect morph_view_rect = full_window; morph_view_rect.stretch( -STATUS_BAR_HEIGHT ); @@ -2380,7 +2379,17 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) case KEY_LEFT: case KEY_RIGHT: case KEY_UP: + // let CTRL UP through for chat line history + if( MASK_CONTROL & mask ) + { + break; + } case KEY_DOWN: + // let CTRL DOWN through for chat line history + if( MASK_CONTROL & mask ) + { + break; + } case KEY_PAGE_UP: case KEY_PAGE_DOWN: case KEY_HOME: |