Second Life viewer sources 1.21.0-RC

1 files changed, 14 insertions, 13 deletions

diff --git a/linden/indra/llwindow/llkeyboard.cpp b/linden/indra/llwindow/llkeyboard.cpp
index c6502ed..cc6f73b 100644
--- a/linden/indra/llwindow/llkeyboard.cpp
+++ b/linden/indra/llwindow/llkeyboard.cpp
@@ -43,8 +43,8 @@
 LLKeyboard *gKeyboard = NULL;
 
 //static
-std::map<KEY,LLString> LLKeyboard::sKeysToNames;
-std::map<LLString,KEY> LLKeyboard::sNamesToKeys;
+std::map<KEY,std::string> LLKeyboard::sKeysToNames;
+std::map<std::string,KEY> LLKeyboard::sNamesToKeys;
 
 //
 // Class Implementation
@@ -67,6 +67,7 @@ LLKeyboard::LLKeyboard() : mCallbacks(NULL), mNumpadDistinct(ND_NUMLOCK_OFF)
 
         mInsertMode = LL_KIM_INSERT;
         mCurTranslatedKey = KEY_NONE;
+        mCurScanKey = KEY_NONE;
 
         addKeyName(' ', "Space" );
         addKeyName(KEY_RETURN, "Enter" );
@@ -143,11 +144,11 @@ LLKeyboard::~LLKeyboard()
         // nothing
 }
 
-void LLKeyboard::addKeyName(KEY key, const LLString& name)
+void LLKeyboard::addKeyName(KEY key, const std::string& name)
 {
         sKeysToNames[key] = name;
-        LLString nameuc = name;
-        LLString::toUpper(nameuc);
+        std::string nameuc = name;
+        LLStringUtil::toUpper(nameuc);
         sNamesToKeys[nameuc] = key;
 }
 
@@ -293,9 +294,9 @@ S32 LLKeyboard::getKeyElapsedFrameCount(KEY key)
 }
 
 // static
-BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
+BOOL LLKeyboard::keyFromString(const std::string& str, KEY *key)
 {
-        LLString instring(str);
+        std::string instring(str);
         size_t length = instring.size();
 
         if (length < 1)
@@ -317,7 +318,7 @@ BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
                 }
         }
 
-        LLString::toUpper(instring);
+        LLStringUtil::toUpper(instring);
         KEY res = get_if_there(sNamesToKeys, instring, (KEY)0);
         if (res != 0)
         {
@@ -330,15 +331,15 @@ BOOL LLKeyboard::keyFromString(const LLString& str, KEY *key)
 
 
 // static
-LLString LLKeyboard::stringFromKey(KEY key)
+std::string LLKeyboard::stringFromKey(KEY key)
 {
-        LLString res = get_if_there(sKeysToNames, key, LLString::null);
+        std::string res = get_if_there(sKeysToNames, key, std::string());
         if (res.empty())
         {
                 char buffer[2];         /* Flawfinder: ignore */
                 buffer[0] = key;
                 buffer[1] = '\0';
-                res = LLString(buffer);
+                res = std::string(buffer);
         }
         return res;
 }
@@ -346,9 +347,9 @@ LLString LLKeyboard::stringFromKey(KEY key)
 
 
 //static
-BOOL LLKeyboard::maskFromString(const LLString& str, MASK *mask)
+BOOL LLKeyboard::maskFromString(const std::string& str, MASK *mask)
 {
-        LLString instring(str);
+        std::string instring(str);
         if (instring == "NONE")
         {
                 *mask = MASK_NONE;