diff options
author | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
---|---|---|
committer | Rider Linden <rider@lindenlab.com> | 2016-01-15 13:36:38 -0800 |
commit | e7eaa94dfa1eba24cbf1667190a0be37b2f417e4 (patch) | |
tree | 9e9db05ef4d37698a7fa5f68149f724aa569528d /indra/newview/llexpandabletextbox.h | |
parent | 34fe371bfdeb6fc83818c58660c038c372c0f64a (diff) | |
parent | 5a5c023e291990a463b1a91846ce82c70da8daab (diff) |
Merge VR
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
-rwxr-xr-x | indra/newview/llexpandabletextbox.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 5dea35bb82..90d46ab262 100755 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -194,6 +194,8 @@ protected: */ virtual S32 recalculateTextDelta(S32 text_delta); + void setContentTrusted(bool trusted_content); + protected: std::string mText; |