diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2010-10-22 14:27:56 -0700 |
| commit | b30a0b4bdb8493592ac918b1a8649d7dbb3bae51 (patch) | |
| tree | 4688747aca7195cc996451cc4bd376bf1764eb4b /indra/newview/llnamelistctrl.h | |
| parent | be1c9a867440e4306348887ce07c88ba6cd31241 (diff) | |
| parent | d3f3dd0998ee8a2159a98d2d8b4b02dce6176252 (diff) | |
merge
Diffstat (limited to 'indra/newview/llnamelistctrl.h')
| -rw-r--r-- | indra/newview/llnamelistctrl.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/indra/newview/llnamelistctrl.h b/indra/newview/llnamelistctrl.h index 981e3df16b..6805630ef1 100644 --- a/indra/newview/llnamelistctrl.h +++ b/indra/newview/llnamelistctrl.h @@ -31,6 +31,7 @@ #include "llscrolllistctrl.h" +class LLAvatarName; class LLNameListCtrl : public LLScrollListCtrl, public LLInstanceTracker<LLNameListCtrl> @@ -74,6 +75,7 @@ public: { Optional<NameColumn> name_column; Optional<bool> allow_calling_card_drop; + Optional<bool> short_names; Params(); }; @@ -99,11 +101,6 @@ public: void removeNameItem(const LLUUID& agent_id); - void refresh(const LLUUID& id, const std::string& first, const std::string& last, BOOL is_group); - - static void refreshAll(const LLUUID& id, const std::string& firstname, - const std::string& lastname, BOOL is_group); - // LLView interface /*virtual*/ BOOL handleDragAndDrop(S32 x, S32 y, MASK mask, BOOL drop, EDragAndDropType cargo_type, void *cargo_data, @@ -118,11 +115,13 @@ public: /*virtual*/ void mouseOverHighlightNthItem( S32 index ); private: void showInspector(const LLUUID& avatar_id, bool is_group); + void onAvatarNameCache(const LLUUID& agent_id, const LLAvatarName& av_name); private: S32 mNameColumnIndex; std::string mNameColumn; BOOL mAllowCallingCardDrop; + bool mShortNames; // display name only, no SLID }; /** |