diff options
| author | Graham Linden <graham@lindenlab.com> | 2019-09-10 10:19:50 -0700 |
|---|---|---|
| committer | Graham Linden <graham@lindenlab.com> | 2019-09-10 10:19:50 -0700 |
| commit | a97f13e16177425cceac9f0c4abf9935bbda9f8c (patch) | |
| tree | 4246799b9ce9d8b97d6b9cfd851114dbb214f505 /indra/llui | |
| parent | cddce7bbb8975c27d561e9868e8a28f48e2a5208 (diff) | |
| parent | e241670694959833feaa0e667222b337095eb683 (diff) | |
Merge viewer-release 6.3.2
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/lltextbox.cpp | 1 | ||||
| -rw-r--r-- | indra/llui/lltransutil.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/lltextbox.cpp b/indra/llui/lltextbox.cpp index 01fe82e45d..9faff1278d 100644 --- a/indra/llui/lltextbox.cpp +++ b/indra/llui/lltextbox.cpp @@ -122,6 +122,7 @@ void LLTextBox::setEnabled(BOOL enabled) LLTextBase::setReadOnly(read_only); updateSegments(); } + LLTextBase::setEnabled(enabled); } void LLTextBox::setText(const LLStringExplicit& text , const LLStyle::Params& input_params ) diff --git a/indra/llui/lltransutil.cpp b/indra/llui/lltransutil.cpp index 220cee4c90..b1534bb5e4 100644 --- a/indra/llui/lltransutil.cpp +++ b/indra/llui/lltransutil.cpp @@ -44,7 +44,7 @@ bool LLTransUtil::parseStrings(const std::string& xml_filename, const std::set<s bool success = LLUICtrlFactory::getLayeredXMLNode(xml_filename, root, LLDir::ALL_SKINS); if (!success) { - LL_ERRS() << "Couldn't load string table " << xml_filename << LL_ENDL; + LL_ERRS() << "Couldn't load string table " << xml_filename << ". Please reinstall viewer from https://secondlife.com/support/downloads/ and contact https://support.secondlife.com if issue persists after reinstall." << LL_ENDL; return false; } |