diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-02-24 10:46:17 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-02-24 10:46:17 -0500 |
| commit | a91482f0afa38c39a027f5b54bca652147917f2a (patch) | |
| tree | 38ffcebfd0d5ec23b7e792b06a2997198590016f /indra/llui/lllineeditor.cpp | |
| parent | 3cf4ebf17c2209dfed7bae21075cf517f123e32b (diff) | |
| parent | 25561a3b1d4c876bd90a10bace1fde02fc04ae53 (diff) | |
merge changes for MAINT-4790
Diffstat (limited to 'indra/llui/lllineeditor.cpp')
| -rwxr-xr-x | indra/llui/lllineeditor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llui/lllineeditor.cpp b/indra/llui/lllineeditor.cpp index ae94a021d1..a08cf91a69 100755 --- a/indra/llui/lllineeditor.cpp +++ b/indra/llui/lllineeditor.cpp @@ -88,6 +88,7 @@ LLLineEditor::Params::Params() background_image("background_image"), background_image_disabled("background_image_disabled"), background_image_focused("background_image_focused"), + bg_image_always_focused("bg_image_always_focused", false), select_on_focus("select_on_focus", false), revert_on_esc("revert_on_esc", true), spellcheck("spellcheck", false), @@ -147,6 +148,7 @@ LLLineEditor::LLLineEditor(const LLLineEditor::Params& p) mBgImage( p.background_image ), mBgImageDisabled( p.background_image_disabled ), mBgImageFocused( p.background_image_focused ), + mShowImageFocused( p.bg_image_always_focused ), mHaveHistory(FALSE), mReplaceNewlinesWithSpaces( TRUE ), mLabel(p.label), @@ -1675,7 +1677,7 @@ void LLLineEditor::drawBackground() { image = mBgImageDisabled; } - else if ( has_focus ) + else if ( has_focus || mShowImageFocused) { image = mBgImageFocused; } |