diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-02-02 12:17:29 +0200 |
| commit | 9b0518dd8e46dfe74eaa0f7622b1486dbde32b82 (patch) | |
| tree | 2c637ad3b5a5cfa8ec1e97c30c3de9efe5cac59b /indra/newview/llavatarlist.h | |
| parent | 7f83000ea13bac5b4cccb9a6f12e764ac8d69b2a (diff) | |
| parent | 4ad357ec70e15afdfe78816990cb23c7ba17619c (diff) | |
Merge from default branch
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llavatarlist.h')
| -rw-r--r-- | indra/newview/llavatarlist.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index a58a562378..aeed4fee08 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -57,11 +57,11 @@ public: struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { - Optional<bool> ignore_online_status; // show all items as online - Optional<bool> show_last_interaction_time; // show most recent interaction time. *HACK: move this to a derived class - Optional<bool> show_info_btn; - Optional<bool> show_profile_btn; - Optional<bool> show_speaking_indicator; + Optional<bool> ignore_online_status, // show all items as online + show_last_interaction_time, // show most recent interaction time. *HACK: move this to a derived class + show_info_btn, + show_profile_btn, + show_speaking_indicator; Params(); }; |