diff options
| author | Denis Serdjuk <dserduk@productengine.com> | 2010-01-19 19:49:39 +0200 |
|---|---|---|
| committer | Denis Serdjuk <dserduk@productengine.com> | 2010-01-19 19:49:39 +0200 |
| commit | 1d9237e299e152c5a58f89be3da2f40e1e2d7338 (patch) | |
| tree | 0421d309f3f4988e6d226d3fb2f59c1c45d5a6f3 | |
| parent | a2d083f3ce7b490c88285410591dbcf3592609a2 (diff) | |
fixed bug EXT-4445 [BSI] Can start an IM session with myself and offer items via context menu in group chat participants list
--HG--
branch : product-engine
| -rw-r--r-- | indra/newview/llparticipantlist.cpp | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_participant_list.xml | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 0a180512ce..b049f914ad 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -582,7 +582,7 @@ void LLParticipantList::LLParticipantListMenu::moderateVoiceOtherParticipants(co bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& userdata) { std::string item = userdata.asString(); - if (item == "can_mute_text" || "can_block" == item) + if (item == "can_mute_text" || "can_block" == item || "can_share" == item || "can_im" == item) { return mUUIDs.front() != gAgentID; } diff --git a/indra/newview/skins/default/xui/en/menu_participant_list.xml b/indra/newview/skins/default/xui/en/menu_participant_list.xml index 31263fbea8..805ffbae66 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_list.xml @@ -47,6 +47,9 @@ name="IM"> <menu_item_call.on_click function="Avatar.IM" /> + <menu_item_call.on_enable + function="ParticipantList.EnableItem" + parameter="can_im" /> </menu_item_call> <menu_item_call label="Call" @@ -65,6 +68,9 @@ name="Share"> <menu_item_call.on_click function="Avatar.Share" /> + <menu_item_call.on_enable + function="ParticipantList.EnableItem" + parameter="can_share" /> </menu_item_call> <menu_item_call label="Pay" |