diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-04-05 15:12:12 -0700 |
| commit | a0a7b7ed16a9161b8060e8f32e5594356e5c7329 (patch) | |
| tree | 06809cac6cde316219cbcbf58a7381d907a9d5e6 /indra/newview/llavatarlist.h | |
| parent | 6b3ca581e037d52e507a69d82fd6d900bd4641b7 (diff) | |
| parent | 9bfc1c3b1060f15990bba218795a1ef6009d1535 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llavatarlist.h')
| -rw-r--r-- | indra/newview/llavatarlist.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index 5a55975413..0203617867 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -53,8 +53,6 @@ class LLAvatarList : public LLFlatListView { LOG_CLASS(LLAvatarList); public: - typedef uuid_vec_t uuid_vector_t; - struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { Optional<bool> ignore_online_status, // show all items as online @@ -74,7 +72,7 @@ public: void setNameFilter(const std::string& filter); void setDirty(bool val = true, bool force_refresh = false); - uuid_vector_t& getIDs() { return mIDs; } + uuid_vec_t& getIDs() { return mIDs; } bool contains(const LLUUID& id); void setContextMenu(LLAvatarListItem::ContextMenu* menu) { mContextMenu = menu; } @@ -122,7 +120,7 @@ private: LLTimer* mLITUpdateTimer; // last interaction time update timer std::string mIconParamName; std::string mNameFilter; - uuid_vector_t mIDs; + uuid_vec_t mIDs; LLUUID mSessionID; LLAvatarListItem::ContextMenu* mContextMenu; |