Merge branch 'master' into DRTVWR-483

# Conflicts:
#	indra/newview/llviewermenu.cpp

1 files changed, 5 insertions, 5 deletions

diff --git a/indra/newview/llsetkeybinddialog.cpp b/indra/newview/llsetkeybinddialog.cpp
index 4b36822e9a..74844a80e8 100644
--- a/indra/newview/llsetkeybinddialog.cpp
+++ b/indra/newview/llsetkeybinddialog.cpp
@@ -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;
     }