diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-15 18:21:08 +0000 |
| commit | 7286516e9193e7549c9d8ecde65df85402443fab (patch) | |
| tree | 236b1c50e3f5ed5bfa85abb7d1d54cbc1a384d7b /indra/newview/lllocationinputctrl.cpp | |
| parent | 1bb68d936de2657c3bce3bbe64947f043b5f7333 (diff) | |
| parent | 398af7dd40a060cf9ad8d799df03d448c2f53a96 (diff) | |
viewer2 merge
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() |