diff options
| author | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-02-17 17:02:26 -0800 |
| commit | cf52fc85ae4d06335a09b4dd60bddeb7f66841b3 (patch) | |
| tree | afa95f76e9ef3ebe9b91dce90d2a8671f28ab435 /indra/newview/lllocationinputctrl.cpp | |
| parent | 7c86d4434822d7a3172bed82c3812032089c1518 (diff) | |
| parent | 9dfff8c6d2a54e3f6e069c26cc8753dc9331aec1 (diff) | |
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() |