diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-22 10:35:35 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2012-10-22 10:35:35 -0700 |
| commit | 520a29962081cb420341d8c40925569c20cadc2a (patch) | |
| tree | 39a64ebc7473fdedd9eaef0abc656d448653708b /indra/llui/lltextbase.cpp | |
| parent | b0c54dfd3e2ecc8d4f875276397a55cef40a3d9a (diff) | |
| parent | 730ba97759deabd7fb45e63eae650f83c1d9ba99 (diff) | |
merging in latest changes
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(); |