Second Life viewer sources 1.13.2.15

5 files changed, 35 insertions, 14 deletions

diff --git a/linden/indra/llwindow/llgl.cpp b/linden/indra/llwindow/llgl.cpp
index 547a353..ec22907 100644
--- a/linden/indra/llwindow/llgl.cpp
+++ b/linden/indra/llwindow/llgl.cpp
@@ -365,6 +365,7 @@ bool LLGLManager::initGL()
         // from being recognized as ATI.
         if (mGLVendor.substr(0,4) == "ATI ")
         {
+                mGLVendorShort = "ATI";
                 BOOL mobile = FALSE;
                 if (mGLRenderer.find("MOBILITY") != LLString::npos)
                 {
@@ -404,6 +405,7 @@ bool LLGLManager::initGL()
         }
         else if (mGLVendor.find("NVIDIA ") != LLString::npos)
         {
+                mGLVendorShort = "NVIDIA";
                 mIsNVIDIA = TRUE;
                 if (   mGLRenderer.find("GEFORCE4 MX") != LLString::npos
                         || mGLRenderer.find("GEFORCE2") != LLString::npos
@@ -428,9 +430,14 @@ bool LLGLManager::initGL()
         }
         else if (mGLVendor.find("INTEL") != LLString::npos)
         {
+                mGLVendorShort = "INTEL";
                 mIsIntel = TRUE;
         }
-                
+        else
+        {
+                mGLVendorShort = "MISC";
+        }
+        
         // This is called here because it depends on the setting of mIsGF2or4MX, and sets up mHasMultitexture.
         initExtensions();
 
diff --git a/linden/indra/llwindow/llgl.h b/linden/indra/llwindow/llgl.h
index 1c93b63..c0668ca 100644
--- a/linden/indra/llwindow/llgl.h
+++ b/linden/indra/llwindow/llgl.h
@@ -125,6 +125,7 @@ public:
 
         // In ALL CAPS
         LLString mGLVendor;
+        LLString mGLVendorShort;
 
         // In ALL CAPS
         LLString mGLRenderer;
diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index fd6fcdc..409bb13 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -157,7 +157,6 @@ void LLKeyboard::resetKeys()
                 if( mKeyLevel[i] )
                 {
                         mKeyLevel[i] = FALSE;
-                        mKeyLevelFrameCount[i] = 0;
                 }
         }
 
diff --git a/linden/indra/llwindow/llkeyboardwin32.cpp b/linden/indra/llwindow/llkeyboardwin32.cpp
index 531ad87..e166ec2 100644
--- a/linden/indra/llwindow/llkeyboardwin32.cpp
+++ b/linden/indra/llwindow/llkeyboardwin32.cpp
@@ -266,7 +266,6 @@ void LLKeyboardWin32::scanKeyboard()
                                 {
                                         //llinfos << "Key up event missed, resetting" << llendl;
                                         mKeyLevel[key] = FALSE;
-                                        mKeyLevelFrameCount[key] = 0;
                                 }
                         }
                 }
diff --git a/linden/indra/llwindow/llwindowwin32.cpp b/linden/indra/llwindow/llwindowwin32.cpp
index b405bdb..5929fb5 100644
--- a/linden/indra/llwindow/llwindowwin32.cpp
+++ b/linden/indra/llwindow/llwindowwin32.cpp
@@ -1969,19 +1969,34 @@ LRESULT CALLBACK LLWindowWin32::mainWindowProc(HWND h_wnd, UINT u_msg, WPARAM w_
                         // allow system keys, such as ALT-F4 to be processed by Windows
                         eat_keystroke = FALSE;
                 case WM_KEYDOWN:
-                        if (gDebugWindowProc)
-                        {
-                                llinfos << "Debug WindowProc WM_KEYDOWN "
-                                        << " key " << S32(w_param) 
-                                        << llendl;
-                        }
-                        if (gKeyboard->handleKeyDown(w_param, mask) && eat_keystroke)
                         {
-                                return 0;
+                                if (gDebugWindowProc)
+                                {
+                                        llinfos << "Debug WindowProc WM_KEYDOWN "
+                                                << " key " << S32(w_param) 
+                                                << llendl;
+                                }
+                                // lower 15 bits hold key repeat count
+                                S32 key_repeat_count = l_param & 0x7fff;
+                                if (key_repeat_count > 1)
+                                {
+                                        KEY translated_key;
+                                        gKeyboard->translateKey(w_param, &translated_key);
+                                        if (!gKeyboard->getKeyDown(translated_key))
+                                        {
+                                                //RN: hack for handling key repeats when we no longer recognize the key as being down
+                                                //This is necessary because we sometimes ignore the message queue and use getAsyncKeyState
+                                                // to clear key level flags before we've processed all key repeat messages
+                                                return 0;
+                                        }
+                                }
+                                if(gKeyboard->handleKeyDown(w_param, mask) && eat_keystroke)
+                                {
+                                        return 0;
+                                }
+                                // pass on to windows if we didn't handle it
+                                break;
                         }
-                        // pass on to windows if we didn't handle it
-                        break;
-
                 case WM_SYSKEYUP:
                         eat_keystroke = FALSE;
                 case WM_KEYUP: