diff options
| author | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-12-07 10:40:12 -0800 |
| commit | 864dd45b2b8dec32552112ed76246c9b0b3f7f0b (patch) | |
| tree | de5ce187a9b26f67d2515fa140aa8d313e64a51d /indra/newview/lllocationinputctrl.cpp | |
| parent | 5d4959e3a107a6a40014528dd8e17e46bf128540 (diff) | |
| parent | 7ff7709f9fd07de5cc9b039562d0fe3794f6ce36 (diff) | |
merge
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index ab26399c1a..98ca339f0c 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -810,13 +810,8 @@ void LLLocationInputCtrl::updateWidgetlayout() { const LLRect& rect = getLocalRect(); const LLRect& hist_btn_rect = mButton->getRect(); - LLRect info_btn_rect = mInfoBtn->getRect(); - // info button - info_btn_rect.setOriginAndSize( - 2, (rect.getHeight() - info_btn_rect.getHeight()) / 2, - info_btn_rect.getWidth(), info_btn_rect.getHeight()); - mInfoBtn->setRect(info_btn_rect); + // Info button is set in the XUI XML location_input.xml // "Add Landmark" button LLRect al_btn_rect = mAddLandmarkBtn->getRect(); @@ -912,7 +907,7 @@ bool LLLocationInputCtrl::onLocationContextMenuItemEnabled(const LLSD& userdata) } else if (item == "can_select_all") { - return mTextEntry->canSelectAll(); + return mTextEntry->canSelectAll() && (mTextEntry->getLength() > 0); } else if(item == "show_coordinates") { |