Commit c65521c3 authored by Kitty Barnett's avatar Kitty Barnett
Browse files

Merged with .Catznip tip

--HG--
branch : Catznip
parents 82931fd8 b096760d
......@@ -665,7 +665,7 @@ void LLPanelStandStopFlying::clearStandStopFlyingMode(EStandStopFlyingMode mode)
LL_ERRS() << "Unexpected EStandStopFlyingMode is passed: " << mode << LL_ENDL;
}
// [SL:KB] - Patch: Appearance-Complexity | Checked: Catznip-5.4
panel->setVisible(false);
panel->setVisible(panel->mStandButton->getVisible() || panel->mStopFlyingButton->getVisible());
// [/SL:KB]
}
......
......@@ -3014,11 +3014,11 @@ void LLVOAvatar::idleUpdateNameTagText(BOOL new_name)
bool use_complexity_color = false;
LLColor4 complexity_color;
static LLUICachedControl<S32> render_others_as("RenderOthersAs", (int)ERenderAvatarAs::NORMAL);
static LLUICachedControl<S32> render_others_as("RenderOthersAs", (int)ERenderOthersAs::NORMALLY);
static LLUICachedControl<bool> show_avatar_complexity("RenderNameShowComplexity", true);
static LLUICachedControl<bool> show_avatar_complexity_atlimit("RenderNameShowComplexityAtLimit", true);
static LLUICachedControl<bool> show_avatar_complexity_self("RenderNameShowComplexitySelf", false);
if ( (show_avatar_complexity) && (render_others_as == (int)ERenderAvatarAs::NORMAL) &&
if ( (show_avatar_complexity) && ((render_others_as == (int)ERenderOthersAs::NORMALLY) || (render_others_as == (int)ERenderOthersAs::IMPOSTERS)) &&
( (!isSelf() && (!show_avatar_complexity_atlimit || isVisuallyMuted())) ||
(isSelf() && show_avatar_complexity_self) ) )
{
......@@ -9265,7 +9265,11 @@ void LLVOAvatar::updateImpostorRendering(U32 newMaxNonImpostorsValue)
sMaxNonImpostors = newMaxNonImpostorsValue;
}
// the sUseImpostors flag depends on whether or not sMaxNonImpostors is set to the no-limit value (0)
sUseImpostors = (0 != sMaxNonImpostors);
// [SL:KB] - Patch: Appearance-Complexity | Checked: Catznip-5.4
static LLUICachedControl<S32> render_others_as("RenderOthersAs", (int)ERenderOthersAs::NORMALLY);
sUseImpostors = (0 != sMaxNonImpostors) || (render_others_as != (int)ERenderOthersAs::NORMALLY);
// [/SL:KB]
// sUseImpostors = (0 != sMaxNonImpostors);
if ( oldflg != sUseImpostors )
{
LL_DEBUGS("AvatarRender")
......
......@@ -5,29 +5,29 @@
name="panel_render_others_as_message"
mouse_opaque="false"
visible="true"
width="375">
width="425">
<text
font="SansSerifLarge"
font.style="BOLD"
font_shadow="hard"
font_shadow="hard"
follows="bottom|left"
height="19"
layout="topleft"
left="5"
name="render_message_text"
text_color="White_50"
text_color="White_50"
top="2"
value="Not everyone is (fully) rendered."
width="265" />
value="Not everyone is rendered fully."
width="285" />
<button
follows="bottom|left"
height="19"
height="20"
label="Render Everyone"
layout="topleft"
left_pad="5"
name="render_default_btn"
tool_tip="Click here to render everyone."
top="2"
visible="true"
width="100" />
visible="true"
width="125" />
</panel>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment