summaryrefslogtreecommitdiff
path: root/indra/newview/lllocationinputctrl.cpp
diff options
context:
space:
mode:
authorPalmer Truelson <palmer@lindenlab.com>2009-12-14 11:44:48 -0600
committerPalmer Truelson <palmer@lindenlab.com>2009-12-14 11:44:48 -0600
commitde38b58f37d6c7dadd4a5f15be519cb0bb230fc7 (patch)
treefdfe34a8be0e2086c1e9407931af85f5f8c2fc39 /indra/newview/lllocationinputctrl.cpp
parentfadfa09e6d3bbff9ebae0aabeacf26a83aae4ad7 (diff)
parenta9e409c7071ba74f01158aa7b876a1ad60161fc4 (diff)
Merging in latest viewer 2
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
-rw-r--r--indra/newview/lllocationinputctrl.cpp7
1 files changed, 1 insertions, 6 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();