summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationinputctrl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r--indra/newview/lllocationinputctrl.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp
index 99412c0b16..c455a5e75b 100644
--- a/indra/newview/lllocationinputctrl.cpp
+++ b/indra/newview/lllocationinputctrl.cpp
@@ -455,7 +455,7 @@ LLLocationInputCtrl::~LLLocationInputCtrl()
mLocationHistoryConnection.disconnect();
}
-void LLLocationInputCtrl::setEnabled(BOOL enabled)
+void LLLocationInputCtrl::setEnabled(bool enabled)
{
LLComboBox::setEnabled(enabled);
mAddLandmarkBtn->setEnabled(enabled);
@@ -502,9 +502,9 @@ bool LLLocationInputCtrl::handleToolTip(S32 x, S32 y, MASK mask)
return false;
}
-BOOL LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
+bool LLLocationInputCtrl::handleKeyHere(KEY key, MASK mask)
{
- BOOL result = LLComboBox::handleKeyHere(key, mask);
+ bool result = LLComboBox::handleKeyHere(key, mask);
if (key == KEY_DOWN && hasFocus() && mList->getItemCount() != 0 && !mList->getVisible())
{
@@ -560,13 +560,13 @@ void LLLocationInputCtrl::setText(const LLStringExplicit& text)
mHasAutocompletedText = FALSE;
}
-void LLLocationInputCtrl::setFocus(BOOL b)
+void LLLocationInputCtrl::setFocus(bool b)
{
LLComboBox::setFocus(b);
if (mTextEntry && b && !mList->getVisible())
{
- mTextEntry->setFocus(TRUE);
+ mTextEntry->setFocus(true);
}
}
@@ -613,7 +613,7 @@ void LLLocationInputCtrl::draw()
LLComboBox::draw();
}
-void LLLocationInputCtrl::reshape(S32 width, S32 height, BOOL called_from_parent)
+void LLLocationInputCtrl::reshape(S32 width, S32 height, bool called_from_parent)
{
LLComboBox::reshape(width, height, called_from_parent);