diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-16 13:20:05 +0200 |
| commit | 07a5274e8cb051b74d955690799c2e5ae90e5ff5 (patch) | |
| tree | f5bef8e3f88a5186bd90db897110e51794c5a086 /indra/newview/lllocationinputctrl.cpp | |
| parent | f808bafa663b5b855cbb26af552bbca1caa4c026 (diff) | |
| parent | e3367fad368660bf40db29a82237475a9f2dfdbd (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/lllocationinputctrl.cpp')
| -rw-r--r-- | indra/newview/lllocationinputctrl.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index f48c96190f..c66d067779 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -833,10 +833,13 @@ void LLLocationInputCtrl::refreshParcelIcons() mDamageText->setVisible(false); } - S32 left_pad, right_pad; - mTextEntry->getTextPadding(&left_pad, &right_pad); - right_pad = mTextEntry->getRect().mRight - x; - mTextEntry->setTextPadding(left_pad, right_pad); + if (mTextEntry) + { + S32 left_pad, right_pad; + mTextEntry->getTextPadding(&left_pad, &right_pad); + right_pad = mTextEntry->getRect().mRight - x; + mTextEntry->setTextPadding(left_pad, right_pad); + } } void LLLocationInputCtrl::refreshHealth() |