diff options
author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-13 17:02:13 -0800 |
---|---|---|
committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-02-13 17:02:13 -0800 |
commit | c17b41b5266cc5e2b318768d75e4686c59bb4990 (patch) | |
tree | 6954fd8ebac3f9ef35423c95aad910ac09e594c8 /indra/newview/llfloaterimcontainer.h | |
parent | 30248c2049f6e20fa20e5b9f61cbd1402905d9b8 (diff) | |
parent | 61ac85c5434b8273277e550bf184663090a59d1c (diff) |
merge
Diffstat (limited to 'indra/newview/llfloaterimcontainer.h')
-rw-r--r-- | indra/newview/llfloaterimcontainer.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llfloaterimcontainer.h b/indra/newview/llfloaterimcontainer.h index a28dba3b98..265ae8df4c 100644 --- a/indra/newview/llfloaterimcontainer.h +++ b/indra/newview/llfloaterimcontainer.h @@ -140,8 +140,9 @@ private: const LLConversationItem * getCurSelectedViewModelItem(); void getParticipantUUIDs(uuid_vec_t& selected_uuids); void doToSelected(const LLSD& userdata); - bool checkContextMenuItem(const LLSD& userdata); - bool enableContextMenuItem(const LLSD& userdata); + bool checkContextMenuItem(const LLSD& userdata); + bool enableContextMenuItem(const LLSD& userdata); + bool visibleContextMenuItem(const LLSD& userdata); void doToSelectedConversation(const std::string& command, uuid_vec_t& selectedIDS); void doToSelectedGroup(const LLSD& userdata); |