diff options
| author | maxim_productengine <mnikolenko@productengine.com> | 2012-10-15 13:55:12 +0300 |
|---|---|---|
| committer | maxim_productengine <mnikolenko@productengine.com> | 2012-10-15 13:55:12 +0300 |
| commit | f609f4cca3a91c8d6ea7c55b61d0b2cfd29be6b7 (patch) | |
| tree | 859b18a90780e5625c08da53e2c937ad60f24278 /indra/newview | |
| parent | 1100a84b38494b480b0820bae36c6c8ca2bf12c6 (diff) | |
CHUI-400 FIXED Disable "Activate Group" menu item if selected group is the active group
Diffstat (limited to 'indra/newview')
| -rw-r--r-- | indra/newview/llimfloatercontainer.cpp | 6 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/menu_conversation.xml | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/indra/newview/llimfloatercontainer.cpp b/indra/newview/llimfloatercontainer.cpp index 2248699e5e..16751a6ea1 100644 --- a/indra/newview/llimfloatercontainer.cpp +++ b/indra/newview/llimfloatercontainer.cpp @@ -961,6 +961,12 @@ bool LLIMFloaterContainer::enableContextMenuItem(const LLSD& userdata) uuid_vec_t mUUIDs; getParticipantUUIDs(mUUIDs); + if(item == std::string("can_activate_group")) + { + LLUUID selected_group_id = getCurSelectedViewModelItem()->getUUID(); + return gAgent.getGroupID() != selected_group_id; + } + if(mUUIDs.size() <= 0) { return false; diff --git a/indra/newview/skins/default/xui/en/menu_conversation.xml b/indra/newview/skins/default/xui/en/menu_conversation.xml index 912ff811d9..682d70e4f0 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation.xml @@ -117,6 +117,7 @@ layout="topleft" name="activate_group"> <on_click function="Group.DoToSelected" parameter="activate_group"/> + <on_enable function="Avatar.EnableItem" parameter="can_activate_group" /> </menu_item_call> <menu_item_call label="Leave Group" |