diff options
| author | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2015-07-10 09:12:54 -0400 |
| commit | 66bf21c32d64422f9fdc56161acc83b53923735b (patch) | |
| tree | bdd1e565308fb97d7b8b2c97f9cd16489a1b285d /indra/newview/llexpandabletextbox.h | |
| parent | dc5960d3930efa482b7de205fc9b8d08785da4c8 (diff) | |
| parent | 657944cda7228ba824239d94b270160ac0460934 (diff) | |
merge up to 3.8.0-release (and fix for unit tests with a proxy enabled)'
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; |