Port from Emerald: allow any key for gestures

1 files changed, 23 insertions, 3 deletions

diff --git a/linden/indra/newview/llpreviewgesture.cpp b/linden/indra/newview/llpreviewgesture.cpp
index ff3b943..ee1b634 100644
--- a/linden/indra/newview/llpreviewgesture.cpp
+++ b/linden/indra/newview/llpreviewgesture.cpp
@@ -564,14 +564,34 @@ void LLPreviewGesture::addModifiers()
         combo->setCurrentByIndex(0);
 }
 
+std::string magic_key(KEY key)
+{
+        char buffer[2];         /* Flawfinder: ignore */
+        buffer[0] = key;
+        buffer[1] = '\0';
+        std::string res = std::string(buffer);
+        std::string lolk = LLKeyboard::stringFromKey(key);
+        if(res == lolk)
+        {
+                if( key >= ' ' && key <= '~' )
+                {
+                        return lolk;
+                }else
+                {
+                        return "";
+                }
+        }
+        return lolk;
+}
 void LLPreviewGesture::addKeys()
 {
         LLComboBox* combo = mKeyCombo;
 
         combo->add( NONE_LABEL );
-        for (KEY key = KEY_F2; key <= KEY_F12; key++)
+        for (KEY key = ' '; key < KEY_NONE; key++)
         {
-                combo->add( LLKeyboard::stringFromKey(key), ADD_BOTTOM );
+                std::string keystr = magic_key(key);
+                if(keystr != "")combo->add( keystr, ADD_BOTTOM );
         }
         combo->setCurrentByIndex(0);
 }
@@ -1238,7 +1258,7 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data,
                         else
                         {
                                 llwarns << "Inventory item for gesture " << info->mItemUUID
-                                                << " is no longer in agent inventory." << llendl
+                                                << " is no longer in agent inventory." << llendl;
                         }
                 }
                 else