diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-10-19 17:42:22 -0700 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-10-19 17:42:22 -0700 |
| commit | 730ba97759deabd7fb45e63eae650f83c1d9ba99 (patch) | |
| tree | 2d484050ef7942ffdad6ec4636a0d35e43158917 /indra/llui/lltextbase.cpp | |
| parent | e6a7133ef1fa1760e0bfb53f5b14e7b6e76da0f5 (diff) | |
| parent | 0356ef61cf9f70b97dc78a59fba58465d99f5fc0 (diff) | |
Pull merge from richard/viewer-chui
Diffstat (limited to 'indra/llui/lltextbase.cpp')
| -rw-r--r-- | indra/llui/lltextbase.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/llui/lltextbase.cpp b/indra/llui/lltextbase.cpp index b827acb185..8839afb60d 100644 --- a/indra/llui/lltextbase.cpp +++ b/indra/llui/lltextbase.cpp @@ -1359,6 +1359,7 @@ void LLTextBase::onSpellCheckSettingsChange() void LLTextBase::onFocusReceived() { + LLUICtrl::onFocusReceived(); if (!getLength() && !mLabel.empty()) { // delete label which is LLLabelTextSegment @@ -1368,6 +1369,7 @@ void LLTextBase::onFocusReceived() void LLTextBase::onFocusLost() { + LLUICtrl::onFocusLost(); if (!getLength() && !mLabel.empty()) { resetLabel(); |