diff options
| author | McCabe Maxsted | 2010-09-08 20:51:22 -0700 |
|---|---|---|
| committer | McCabe Maxsted | 2010-09-10 19:10:24 -0700 |
| commit | 22ac59d80ea47b2f75db835dd29471f75ad661ee (patch) | |
| tree | cea9eaa45deab48c677f0e1c7af0ccd8fa9637b4 /linden | |
| parent | Added a Extra tab in adv. preferences to enable/disable chat colors and to se... (diff) | |
| download | meta-impy-22ac59d80ea47b2f75db835dd29471f75ad661ee.zip meta-impy-22ac59d80ea47b2f75db835dd29471f75ad661ee.tar.gz meta-impy-22ac59d80ea47b2f75db835dd29471f75ad661ee.tar.bz2 meta-impy-22ac59d80ea47b2f75db835dd29471f75ad661ee.tar.xz | |
Port from Emerald: allow any key for gestures
Diffstat (limited to 'linden')
| -rw-r--r-- | linden/indra/newview/llpreviewgesture.cpp | 26 |
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() | |||
| 564 | combo->setCurrentByIndex(0); | 564 | combo->setCurrentByIndex(0); |
| 565 | } | 565 | } |
| 566 | 566 | ||
| 567 | std::string magic_key(KEY key) | ||
| 568 | { | ||
| 569 | char buffer[2]; /* Flawfinder: ignore */ | ||
| 570 | buffer[0] = key; | ||
| 571 | buffer[1] = '\0'; | ||
| 572 | std::string res = std::string(buffer); | ||
| 573 | std::string lolk = LLKeyboard::stringFromKey(key); | ||
| 574 | if(res == lolk) | ||
| 575 | { | ||
| 576 | if( key >= ' ' && key <= '~' ) | ||
| 577 | { | ||
| 578 | return lolk; | ||
| 579 | }else | ||
| 580 | { | ||
| 581 | return ""; | ||
| 582 | } | ||
| 583 | } | ||
| 584 | return lolk; | ||
| 585 | } | ||
| 567 | void LLPreviewGesture::addKeys() | 586 | void LLPreviewGesture::addKeys() |
| 568 | { | 587 | { |
| 569 | LLComboBox* combo = mKeyCombo; | 588 | LLComboBox* combo = mKeyCombo; |
| 570 | 589 | ||
| 571 | combo->add( NONE_LABEL ); | 590 | combo->add( NONE_LABEL ); |
| 572 | for (KEY key = KEY_F2; key <= KEY_F12; key++) | 591 | for (KEY key = ' '; key < KEY_NONE; key++) |
| 573 | { | 592 | { |
| 574 | combo->add( LLKeyboard::stringFromKey(key), ADD_BOTTOM ); | 593 | std::string keystr = magic_key(key); |
| 594 | if(keystr != "")combo->add( keystr, ADD_BOTTOM ); | ||
| 575 | } | 595 | } |
| 576 | combo->setCurrentByIndex(0); | 596 | combo->setCurrentByIndex(0); |
| 577 | } | 597 | } |
| @@ -1238,7 +1258,7 @@ void LLPreviewGesture::onSaveComplete(const LLUUID& asset_uuid, void* user_data, | |||
| 1238 | else | 1258 | else |
| 1239 | { | 1259 | { |
| 1240 | llwarns << "Inventory item for gesture " << info->mItemUUID | 1260 | llwarns << "Inventory item for gesture " << info->mItemUUID |
| 1241 | << " is no longer in agent inventory." << llendl | 1261 | << " is no longer in agent inventory." << llendl; |
| 1242 | } | 1262 | } |
| 1243 | } | 1263 | } |
| 1244 | else | 1264 | else |