diff options
| author | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-06-30 11:51:58 -0700 |
| commit | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (patch) | |
| tree | e24f1b1735f17968410704e56d0e043fb143aafe /indra/newview/llexpandabletextbox.h | |
| parent | f7908a50294adff3456436074075a677a9c6239b (diff) | |
| parent | 4aa64b99dbe6cafdccf0c25501feaef5ba3445c4 (diff) | |
Merge with head of viewer-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; |