diff options
| author | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2010-08-26 12:49:00 -0700 |
| commit | 093e83386d5a132cc8947095f93ea6405aab6e3f (patch) | |
| tree | 043184fa92c8a6a9f8e747eb13056616bb27ba20 /indra/llui/llsliderctrl.cpp | |
| parent | 2667c77a1cfb230ade472a047f46fd2bde7883c0 (diff) | |
| parent | ce1a0c6bafad092f9687e3b5a6b4865569d96863 (diff) | |
merge
Diffstat (limited to 'indra/llui/llsliderctrl.cpp')
| -rw-r--r-- | indra/llui/llsliderctrl.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llui/llsliderctrl.cpp b/indra/llui/llsliderctrl.cpp index 04958075db..1c410cc1aa 100644 --- a/indra/llui/llsliderctrl.cpp +++ b/indra/llui/llsliderctrl.cpp @@ -235,6 +235,10 @@ void LLSliderCtrl::updateText() std::string text = llformat(format.c_str(), displayed_value); if( mEditor ) { + // Setting editor text here to "" before using actual text is here because if text which + // is set is the same as the one which is actually typed into lineeditor, LLLineEditor::setText() + // will exit at it's beginning, so text for revert on escape won't be saved. (EXT-8536) + mEditor->setText( LLStringUtil::null ); mEditor->setText( text ); } else |