diff options
| author | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
|---|---|---|
| committer | Gilbert Gonzales <username@lindenlab.com> | 2012-08-31 11:02:14 -0700 |
| commit | 461550a8ff492dadd026d68949ef732d447bf592 (patch) | |
| tree | d03f59b0f663218b681abf124af9eef0dd44b8f6 /indra/newview/skins/default | |
| parent | 1aadf94fe44036d6012eb7d4f8a0b9288a719f37 (diff) | |
| parent | c2bb1a189c5f4c2367ee38e03371b28948e3ea81 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins/default')
3 files changed, 33 insertions, 10 deletions
diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml index b8d0eef956..8796b87955 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_gear.xml @@ -57,20 +57,28 @@ parameter="can_offer_teleport"/> </menu_item_call> <menu_item_separator /> - <menu_item_check - label="Add friend/Remove friend" + <menu_item_call + label="Add Friend" layout="topleft" - name="Friend_add_remove"> - <menu_item_check.on_click + name="add_friend"> + <on_click function="Calllog.Action" - parameter="add_rem_friend" /> - <menu_item_check.on_check + parameter="add_friend"/> + <on_visible + function="Calllog.Check" + parameter="is_not_friend" /> + </menu_item_call> + <menu_item_call + label="Remove Friend" + layout="topleft" + name="remove_friend"> + <on_click + function="Calllog.Action" + parameter="remove_friend"/> + <on_visible function="Calllog.Check" parameter="is_friend" /> - <menu_item_check.on_enable - function="Calllog.Enable" - parameter="add_rem_friend" /> - </menu_item_check> + </menu_item_call> <menu_item_call label="Invite to group..." layout="topleft" diff --git a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml index 4ab8cb4f7d..ce65b23971 100644 --- a/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml +++ b/indra/newview/skins/default/xui/en/menu_conversation_log_view.xml @@ -34,4 +34,12 @@ function="CallLog.Check" parameter="sort_friends_on_top" /> </menu_item_check> + <menu_item_separator /> + <menu_item_call + label="View Nearby chat history..." + name="view_nearby_chat_history"> + <on_click + function="CallLog.Action" + parameter="view_nearby_chat_history" /> + </menu_item_call> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/en/menu_participant_view.xml b/indra/newview/skins/default/xui/en/menu_participant_view.xml index 6401b0e3b7..df2700c94c 100644 --- a/indra/newview/skins/default/xui/en/menu_participant_view.xml +++ b/indra/newview/skins/default/xui/en/menu_participant_view.xml @@ -2,6 +2,13 @@ <toggleable_menu layout="topleft" name="participant_manu_view"> + <menu_item_call + label="Chat preferences..." + name="chat_preferences"> + <on_click + function="IMFloaterContainer.Action" + parameter="chat_preferences" /> + </menu_item_call> <menu_item_check label="Open conversation log" name="Conversation" |