Skip to content
Snippets Groups Projects
Commit 2878328b authored by Steve Bennetts's avatar Steve Bennetts
Browse files

Renamed "close" to "end" in chiclet context menus

Removed "open" in chiclet context menus
Removed some deprecate "..."
Removed ^M from menu_viewer.xml
parent 5fce305b
No related branches found
No related tags found
No related merge requests found
......@@ -474,7 +474,7 @@ void LLIMP2PChiclet::onMenuItemClicked(const LLSD& user_data)
{
LLAvatarActions::requestFriendshipDialog(other_participant_id);
}
else if("close" == level)
else if("end" == level)
{
LLAvatarActions::endIM(other_participant_id);
}
......@@ -778,7 +778,7 @@ void LLIMGroupChiclet::onMenuItemClicked(const LLSD& user_data)
{
LLGroupActions::show(group_id);
}
else if("close" == level)
else if("end" == level)
{
LLGroupActions::endIM(group_id);
}
......
......@@ -9,27 +9,27 @@
visible="false"
width="128">
<menu_item_call
label="Chat..."
label="Group Info"
layout="topleft"
name="Chat">
name="Show Profile">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="group chat" />
parameter="info" />
</menu_item_call>
<menu_item_call
label="Info..."
label="Show Session"
layout="topleft"
name="Show Profile">
name="Chat">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="info" />
parameter="group chat" />
</menu_item_call>
<menu_item_call
label="Close Session"
label="End Session"
layout="topleft"
name="Close Session">
name="End Session">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="close" />
parameter="end" />
</menu_item_call>
</menu>
......@@ -9,7 +9,7 @@
visible="false"
width="128">
<menu_item_call
label="Show Profile..."
label="Show Profile"
layout="topleft"
name="Show Profile">
<menu_item_call.on_click
......@@ -17,27 +17,27 @@
parameter="profile" />
</menu_item_call>
<menu_item_call
label="Send IM..."
label="Add Friend"
layout="topleft"
name="Send IM">
name="Add Friend">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="im" />
parameter="add" />
</menu_item_call>
<menu_item_call
label="Add Friend..."
label="Show Session"
layout="topleft"
name="Add Friend">
name="Send IM">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="add" />
parameter="im" />
</menu_item_call>
<menu_item_call
label="Close Session"
label="End Session"
layout="topleft"
name="Close Session">
name="End Session">
<menu_item_call.on_click
function="IMChicletMenu.Action"
parameter="close" />
parameter="end" />
</menu_item_call>
</menu>
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment