Second Life viewer sources 1.17.0.12

1 files changed, 11 insertions, 2 deletions

diff --git a/linden/indra/newview/llviewerwindow.cpp b/linden/indra/newview/llviewerwindow.cpp
index c57c84a..0f5bffd 100644
--- a/linden/indra/newview/llviewerwindow.cpp
+++ b/linden/indra/newview/llviewerwindow.cpp
@@ -1579,8 +1579,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
@@ -1877,6 +1875,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 );
@@ -2400,7 +2399,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: