diff options
author | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2013-03-20 18:32:29 -0400 |
commit | e6b7a7e2f6a5175dd6c3e1d8d8c8f8c0e737a030 (patch) | |
tree | 1fc66c532666cdd061ec12e10b99bcb3be00d64e /indra/newview/llpanelpeoplemenus.h | |
parent | 04e78ce4fdd3bbc0e4daa1daabbff2de1c425601 (diff) | |
parent | 2d19d78846ccbd8993c468cc27b8db7f0b93b235 (diff) |
merge changes for DRTVWR-303
Diffstat (limited to 'indra/newview/llpanelpeoplemenus.h')
-rw-r--r-- | indra/newview/llpanelpeoplemenus.h | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/indra/newview/llpanelpeoplemenus.h b/indra/newview/llpanelpeoplemenus.h index d51eaec716..0a1dcef303 100644 --- a/indra/newview/llpanelpeoplemenus.h +++ b/indra/newview/llpanelpeoplemenus.h @@ -33,19 +33,33 @@ namespace LLPanelPeopleMenus { /** - * Menu used in the nearby people list. + * Menu used in the people lists. */ -class NearbyMenu : public LLListContextMenu +class PeopleContextMenu : public LLListContextMenu { public: /*virtual*/ LLContextMenu* createMenu(); + +protected: + virtual void buildContextMenu(class LLMenuGL& menu, U32 flags); + private: bool enableContextMenuItem(const LLSD& userdata); bool checkContextMenuItem(const LLSD& userdata); void offerTeleport(); }; -extern NearbyMenu gNearbyMenu; +/** + * Menu used in the nearby people list. + */ +class NearbyPeopleContextMenu : public PeopleContextMenu +{ +protected: + /*virtual*/ void buildContextMenu(class LLMenuGL& menu, U32 flags); +}; + +extern PeopleContextMenu gPeopleContextMenu; +extern NearbyPeopleContextMenu gNearbyPeopleContextMenu; } // namespace LLPanelPeopleMenus |