Skip to content
Snippets Groups Projects
Commit 99fec568 authored by Merov Linden's avatar Merov Linden
Browse files

Pull merge from richard/viewer-chui

parents f533a251 06a7bd27
Branches
Tags
No related merge requests found
......@@ -767,7 +767,7 @@ void LLLayoutStack::updatePanelRect( LLLayoutPanel* resized_panel, const LLRect&
{ // freeze new size as fraction
F32 new_fractional_size = (updated_auto_resize_headroom == 0.f)
? MAX_FRACTIONAL_SIZE
: llclamp(total_visible_fraction * (F32)(new_dim - panelp->getRelevantMinDim() - 1) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE);
: llclamp(total_visible_fraction * (F32)(new_dim - (panelp->getRelevantMinDim() - 1)) / updated_auto_resize_headroom, MIN_FRACTIONAL_SIZE, MAX_FRACTIONAL_SIZE);
fraction_given_up -= new_fractional_size - panelp->mFractionalSize;
fraction_remaining -= panelp->mFractionalSize;
panelp->mFractionalSize = new_fractional_size;
......
......@@ -246,7 +246,7 @@
parse_highlights="true"
parse_urls="true"
width="230"
left="0">
left="5">
</chat_history>
</layout_panel>
</layout_stack>
......
......@@ -219,7 +219,17 @@
name="Communicate"
tear_off="true">
<menu_item_check
label="Chat..."
label="Conversations..."
name="Conversations">
<menu_item_check.on_check
function="Floater.IsOpen"
parameter="im_container" />
<menu_item_check.on_click
function="Floater.ToggleOrBringToFront"
parameter="im_container" />
</menu_item_check>
<menu_item_check
label="Nearby Chat..."
name="Nearby Chat"
shortcut="control|H"
use_mac_ctrl="true">
......@@ -243,6 +253,17 @@
function="Agent.ToggleMicrophone"
parameter="speak" />
</menu_item_check>
<menu_item_check
label="Conversations Log..."
name="ConversationsLog">
<menu_item_check.on_check
function="Floater.Visible"
parameter="conversation" />
<menu_item_check.on_click
function="Floater.Toggle"
parameter="conversation" />
</menu_item_check>
<menu_item_separator/>
<menu_item_check
label="Voice morphing..."
name="ShowVoice"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment