livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SL-15107 Fix some typos in llsetkeybinddialog

master
Andrey Kleshchev 2021-04-12 18:05:51 +03:00
parent 4bab66a4b8
commit 105416600e
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
indra/newview/llsetkeybinddialog.cpp
View File

@ -96,7 +96,7 @@ BOOL LLSetKeyBindDialog::postBuild()
getChild<LLUICtrl>("Cancel")->setFocus(TRUE);
pCheckBox = getChild<LLCheckBoxCtrl>("apply_all");
pDesription = getChild<LLTextBase>("descritption");
pDescription = getChild<LLTextBase>("description");
gFocusMgr.setKeystrokesOnly(TRUE);
@ -160,8 +160,8 @@ void LLSetKeyBindDialog::setParent(LLKeyBindResponderInterface* parent, LLView*
}
input += getString("keyboard");
}
pDesription->setText(getString("basic_description"));
pDesription->setTextArg("[INPUT]", input);
pDescription->setText(getString("basic_description"));
pDescription->setTextArg("[INPUT]", input);
}
// static
@ -257,8 +257,8 @@ bool LLSetKeyBindDialog::recordAndHandleKey(KEY key, MASK mask, BOOL down)
if (LLKeyConflictHandler::isReservedByMenu(key, mask))
{
pDesription->setText(getString("reserved_by_menu"));
pDesription->setTextArg("[KEYSTR]", LLKeyboard::stringFromAccelerator(mask,key));
pDescription->setText(getString("reserved_by_menu"));
pDescription->setTextArg("[KEYSTR]", LLKeyboard::stringFromAccelerator(mask,key));
mLastMaskKey = 0;
return true;
}

2
indra/newview/llsetkeybinddialog.h
View File

@ -83,7 +83,7 @@ private:
void setKeyBind(EMouseClickType click, KEY key, MASK mask, bool all_modes);
LLKeyBindResponderInterface *pParent;
LLCheckBoxCtrl *pCheckBox;
LLTextBase *pDesription;
LLTextBase *pDescription;
U32 mKeyFilterMask;
Updater *pUpdater;

2
indra/newview/skins/default/xui/en/floater_select_key.xml
View File

@ -33,7 +33,7 @@ Combination [KEYSTR] is reserved by menu.
height="30"
layout="topleft"
left="30"
name="descritption"
name="description"
top="25"
word_wrap="true"
width="212">