diff options
| author | James Cook <james@lindenlab.com> | 2009-11-24 11:39:22 -0800 |
|---|---|---|
| committer | James Cook <james@lindenlab.com> | 2009-11-24 11:39:22 -0800 |
| commit | 58ee415c4972c37256cbd23e2c96cc5f644944d1 (patch) | |
| tree | f5cdcafb3fcd9861b112de84f806115dab52a626 /indra/newview/lllocationinputctrl.cpp | |
| parent | f9081220accfe5c197f1c567af8806bde236f946 (diff) | |
Fixed line editor right padding to work when left padding also assigned
Eliminated UILineEditorHPad and added 2 px of padding to all custom line
editors.
EXT-1735 Show parcel property icons
Review with Leyla pending
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 6b28edf0b6..a57aea5734 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -158,6 +158,7 @@ LLLocationInputCtrl::Params::Params() add_landmark_image_disabled("add_landmark_image_disabled"), add_landmark_image_hover("add_landmark_image_hover"), add_landmark_image_selected("add_landmark_image_selected"), + add_landmark_hpad("add_landmark_hpad", 0), icon_hpad("icon_hpad", 0), add_landmark_button("add_landmark_button"), info_button("info_button"), @@ -174,6 +175,7 @@ LLLocationInputCtrl::Params::Params() LLLocationInputCtrl::LLLocationInputCtrl(const LLLocationInputCtrl::Params& p) : LLComboBox(p), mIconHPad(p.icon_hpad), + mAddLandmarkHPad(p.add_landmark_hpad), mInfoBtn(NULL), mLocationContextMenu(NULL), mAddLandmarkBtn(NULL), @@ -608,7 +610,7 @@ void LLLocationInputCtrl::refreshLocation() void LLLocationInputCtrl::refreshParcelIcons() { // Our "cursor" moving right to left - S32 x = mAddLandmarkBtn->getRect().mLeft - mIconHPad; + S32 x = mAddLandmarkBtn->getRect().mLeft - mAddLandmarkHPad; static LLUICachedControl<bool> show_properties("NavBarShowParcelProperties", false); if (show_properties) |