diff options
author | James Cook <james@lindenlab.com> | 2009-12-04 12:00:30 -0800 |
---|---|---|
committer | James Cook <james@lindenlab.com> | 2009-12-04 12:00:30 -0800 |
commit | b725027713912c5baaa3d812db939247cec2fae1 (patch) | |
tree | e9ea4126a6afbfba3ad7f1007927d96669a18cff /indra | |
parent | fa8b2135f5eaf92b24abe79f908a62e7e2c0a076 (diff) |
EXT-1498 Can't adjust nav bar info button location in XML
Removed C++ code overriding the location.
Trivial, not reviewed.
Diffstat (limited to 'indra')
-rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 7 | ||||
-rw-r--r-- | indra/newview/skins/default/xui/en/widgets/location_input.xml | 9 |
2 files changed, 7 insertions, 9 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 758d8ff903..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(); diff --git a/indra/newview/skins/default/xui/en/widgets/location_input.xml b/indra/newview/skins/default/xui/en/widgets/location_input.xml index 0e2700cb80..17fb58764b 100644 --- a/indra/newview/skins/default/xui/en/widgets/location_input.xml +++ b/indra/newview/skins/default/xui/en/widgets/location_input.xml @@ -22,9 +22,12 @@ > <!-- *NOTE: Tooltips are in strings.xml so they can be localized. See LocationCtrlAddLandmarkTooltip etc. --> - <info_button name="Place Information" - width="16" - height="16" + <info_button + name="Place Information" + width="16" + height="16" + left="4" + top="20" follows="left|top" hover_glow_amount="0.15" image_unselected="Info_Off" |