summaryrefslogtreecommitdiff
path: root/indra/newview/llconversationmodel.cpp
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 17:04:13 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-10-01 17:04:13 -0700
commit598f5345866c58abdd971935d80f9b53756042c9 (patch)
tree945df8428602b23c4b58a548922c0f8d2f672906 /indra/newview/llconversationmodel.cpp
parent47abe344abb668a7b883674365ea74f30443c6bb (diff)
CHUI-102: Right clicking on a group conversation brings up the correct menu. The user can now view the group profile, activate the group and leave the group.
Diffstat (limited to 'indra/newview/llconversationmodel.cpp')
-rw-r--r--indra/newview/llconversationmodel.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/indra/newview/llconversationmodel.cpp b/indra/newview/llconversationmodel.cpp
index 265f77365f..3d1523c874 100644
--- a/indra/newview/llconversationmodel.cpp
+++ b/indra/newview/llconversationmodel.cpp
@@ -221,6 +221,14 @@ void LLConversationItemSession::buildContextMenu(LLMenuGL& menu, U32 flags)
items.push_back(std::string("separator_disconnect_from_voice"));
buildParticipantMenuOptions(items);
}
+ else if(this->getType() == CONV_SESSION_GROUP)
+ {
+ items.push_back(std::string("close_conversation"));
+ items.push_back(std::string("separator_disconnect_from_voice"));
+ items.push_back(std::string("group_profile"));
+ items.push_back(std::string("activate_group"));
+ items.push_back(std::string("leave_group"));
+ }
hide_context_entries(menu, items, disabled_items);
}