diff options
| author | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
|---|---|---|
| committer | callum_linden <none@none> | 2015-07-02 09:40:49 -0700 |
| commit | 71406f1af805d0b88e348b81a67bcde3d0b3d885 (patch) | |
| tree | 9eab3e24208d2aecedf29eed0eebb6f209197475 /indra/newview/llexpandabletextbox.h | |
| parent | d89b4109f9ac3f1ef95480823df292bbc8200347 (diff) | |
| parent | 8eb7e9d9522f598321e1f8cba5ab8166a52c5bcb (diff) | |
Merge with head
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; |