diff options
| author | Merov Linden <merov@lindenlab.com> | 2012-11-21 11:46:38 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2012-11-21 11:46:38 -0800 |
| commit | a12464b9cbc40d4584d6968db2092a56fa3f4bc6 (patch) | |
| tree | 50bcf32330168d0e839633ea081888c24eaec6e4 /indra/newview/llconversationmodel.cpp | |
| parent | 834ded33ae4926b59074f00c13fa3dbf228a3ba0 (diff) | |
CHUI-429, CHUI-511, CHUI-388 : Multiselection and menus in torn off dialogs
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
| -rw-r--r-- | indra/newview/llconversationmodel.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp index 1c56bd672d..0837a49095 100644 --- a/indra/newview/llconversationmodel.cpp +++ b/indra/newview/llconversationmodel.cpp @@ -27,7 +27,6 @@ #include "llviewerprecompiledheaders.h" -#include "llagent.h" #include "llavatarnamecache.h" #include "llavataractions.h" #include "llevents.h" @@ -422,10 +421,8 @@ void LLConversationItemParticipant::buildContextMenu(LLMenuGL& menu, U32 flags) menuentry_vec_t items; menuentry_vec_t disabled_items; - if(gAgent.getID() != mUUID) - { - buildParticipantMenuOptions(items); - } + buildParticipantMenuOptions(items); + hide_context_entries(menu, items, disabled_items); } |