1 files changed, 14 insertions, 3 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index 7cbbb89313..c684113d4e 100644
--- a/indra/newview/llpreviewgesture.cpp
+++ b/indra/newview/llpreviewgesture.cpp
@@ -505,9 +505,17 @@ 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 );
+        char buffer[] = { (char)key, '\0' };
+        std::string str_org(buffer);
+        std::string str_translated = LLKeyboard::stringFromKey(key);
+
+        if (str_org == str_translated)
+        {
+            if (key >= ' ' && key <= '~') combo->add(str_translated, ADD_BOTTOM);
+        }
+        else combo->add(str_translated, ADD_BOTTOM);
     }
     combo->setCurrentByIndex(0);
 }
@@ -517,6 +525,7 @@ void LLPreviewGesture::addKeys()
 void LLPreviewGesture::addAnimations()
 {
     LLComboBox* combo = mAnimationCombo;
+    LLUUID old_value = combo->getCurrentID();
 
     combo->removeall();
 
@@ -565,6 +574,8 @@ void LLPreviewGesture::addAnimations()
 
         combo->add(item->getName(), item->getAssetUUID(), ADD_BOTTOM);
     }
+
+    combo->setCurrentByID(old_value);
 }
 
 
@@ -1410,7 +1421,7 @@ void LLPreviewGesture::onCommitAnimation(LLUICtrl* ctrl, void* data)
         {
             // Assign the animation name
             LLGestureStepAnimation* anim_step = (LLGestureStepAnimation*)step;
-            if (self->mAnimationCombo->getCurrentIndex() == 0)
+            if (self->mAnimationCombo->getCurrentIndex() <= 0)
             {
                 anim_step->mAnimName.clear();
                 anim_step->mAnimAssetID.setNull();