summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview')
-rw-r--r--indra/newview/llpreviewgesture.cpp12
1 files changed, 10 insertions, 2 deletions
diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp
index 7cbbb89313..ddab98b07d 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);
}