diff options
author | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
---|---|---|
committer | Steven Bennetts <steve@lindenlab.com> | 2009-10-21 04:58:23 +0000 |
commit | 6f41747bc4d8afcb2b19ac02295575031bcf9021 (patch) | |
tree | 1e83d8fcf7af6b9416b49bb46cb9e7cf15abffbc /indra/newview/llavatarlist.h | |
parent | 57fca109cae3105b6bc1319e9886c16631bc7374 (diff) |
Merging revisions 2112-2128 of https://svn.aws.productengine.com/secondlife/pe/stable-2 into P:\svn\viewer-2.0.0, respecting ancestry
* Bugs: EXT-1605 EXT-1506 EXT-1663 EXT-1616 EXT-1599 EXT-1587
* Dev: EXT-748 EXT-1447
* IM Cleanup
Diffstat (limited to 'indra/newview/llavatarlist.h')
-rw-r--r-- | indra/newview/llavatarlist.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index ec801645fe..7372538006 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -55,8 +55,7 @@ public: struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { - Optional<S32> volume_column_width; - Optional<bool> online_go_first; + Optional<bool> ignore_online_status; // show all items as online Params(); }; @@ -76,7 +75,7 @@ public: protected: void refresh(); - void addNewItem(const LLUUID& id, const std::string& name, BOOL is_bold, EAddPosition pos = ADD_BOTTOM); + void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM); void computeDifference( const std::vector<LLUUID>& vnew, std::vector<LLUUID>& vadded, @@ -84,7 +83,7 @@ protected: private: - bool mOnlineGoFirst; + bool mIgnoreOnlineStatus; bool mDirty; std::string mNameFilter; |