diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-07 17:06:09 -0400 |
| commit | f7d94905db3f39785863b91f75daf612dc6c3c48 (patch) | |
| tree | ca958ce0a621c0ed8012336fbdb03867409c1f17 /indra/newview/llexpandabletextbox.h | |
| parent | fa1913ea679fd895d709da5c5782b26c7d03a40a (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
merge changes for 3.8.0-release
Diffstat (limited to 'indra/newview/llexpandabletextbox.h')
| -rwxr-xr-x | indra/newview/llexpandabletextbox.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/newview/llexpandabletextbox.h b/indra/newview/llexpandabletextbox.h index 399e48bea2..5dea35bb82 100755 --- a/indra/newview/llexpandabletextbox.h +++ b/indra/newview/llexpandabletextbox.h @@ -103,7 +103,7 @@ public: Optional<LLScrollContainer::Params> scroll; Optional<S32> max_height; - + Optional<bool> bg_visible, expanded_bg_visible; |