livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

A few more fixes.

master
Beq 2022-11-11 16:25:53 +00:00
parent 77d2d4b3a1
commit 69f4ef7cd4
3 changed files with 12 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/newview/llappviewer.cpp
View File

@ -1710,7 +1710,6 @@ bool LLAppViewer::doFrame()
llcoro::suspend();
}
}
}// <FS:Beq> ensure we have the entire top scope of frame covered (close input event and coro "idle")
if (!LLApp::isExiting())
{

22
indra/newview/llfloaterpreference.cpp
View File

@ -167,8 +167,6 @@
#endif
// </FS:LO>
#include "fsperfstats.h"// <FS:Beq/> perfstats
// <FS:Zi> FIRE-19539 - Include the alert messages in Prefs>Notifications>Alerts in preference Search.
#include "llfiltereditor.h"
#include "llviewershadermgr.h"
@ -470,7 +468,7 @@ LLFloaterPreference::LLFloaterPreference(const LLSD& key)
// </FS:Zi>
mCommitCallbackRegistrar.add("Pref.LogPath", boost::bind(&LLFloaterPreference::onClickLogPath, this));
mCommitCallbackRegistrar.add("Pref.RenderExceptions", boost::bind(&LLFloaterPreference::onClickRenderExceptions, this));
mCommitCallbackRegistrar.add("Pref.AutoAdjustments", boost::bind(&LLFloaterPreference::onClickAutoAdjustments, this));
// mCommitCallbackRegistrar.add("Pref.AutoAdjustments", boost::bind(&LLFloaterPreference::onClickAutoAdjustments, this)); // <FS:Beq/> Not required in FS at present
mCommitCallbackRegistrar.add("Pref.HardwareDefaults", boost::bind(&LLFloaterPreference::setHardwareDefaults, this));
mCommitCallbackRegistrar.add("Pref.AvatarImpostorsEnable", boost::bind(&LLFloaterPreference::onAvatarImpostorsEnable, this));
mCommitCallbackRegistrar.add("Pref.UpdateIndirectMaxComplexity", boost::bind(&LLFloaterPreference::updateMaxComplexity, this));
@ -3027,14 +3025,16 @@ void LLFloaterPreference::onClickRenderExceptions()
LLFloaterReg::showInstance("avatar_render_settings");
}
void LLFloaterPreference::onClickAutoAdjustments()
{
LLFloaterPerformance* performance_floater = LLFloaterReg::showTypedInstance<LLFloaterPerformance>("performance");
if (performance_floater)
{
performance_floater->showAutoadjustmentsPanel();
}
}
// <FS:Beq> Not currently used in FS
// void LLFloaterPreference::onClickAutoAdjustments()
// {
// LLFloaterPerformance* performance_floater = LLFloaterReg::showTypedInstance<LLFloaterPerformance>("performance");
// if (performance_floater)
// {
// performance_floater->showAutoadjustmentsPanel();
// }
// }
// </FS:Beq>
void LLFloaterPreference::onClickAdvanced()
{

271
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
View File

@ -30,197 +30,6 @@
follows="all"
label="General"
name="General" >
<text
follows="top|left|right"
height="16"
layout="topleft"
left="5"
name="preset_label"
top="5"
width="70">
Preset in use:
</text>
<text
follows="top|left|right"
height="16"
layout="topleft"
left_pad="10"
name="preset_text"
top="5"
width="120">
(None)
</text>
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left="10"
name="QualitySpeed"
top_delta="35"
width="400">
Quality &amp; speed:
</text>
<text
type="string"
length="1"
follows="left|top"
halign="center"
height="12"
layout="topleft"
left="118"
name="ShadersPrefText"
top_delta="0"
width="80">
Low
</text>
<text
type="string"
length="1"
follows="left|top"
halign="center"
height="12"
layout="topleft"
left_delta="87"
name="ShadersPrefText2"
top_delta="0"
width="80">
Mid
</text>
<text
type="string"
length="1"
follows="left|top"
halign="center"
height="12"
layout="topleft"
left_delta="87"
name="ShadersPrefText3"
top_delta="0"
width="80">
High
</text>
<text
type="string"
length="1"
follows="left|top"
halign="center"
height="12"
layout="topleft"
left_delta="85"
name="ShadersPrefText4"
top_delta="0"
width="80">
Ultra
</text>
<text
type="string"
length="1"
follows="left|top"
halign="right"
height="12"
layout="topleft"
left="65"
name="FasterText"
top_pad="4"
width="80">
Faster
</text>
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left_delta="360"
name="BetterText"
top_delta="0"
width="100">
Better
</text>
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left="158"
name="LowGraphicsDivet"
top_delta="-2"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="LowMidGraphicsDivet"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="MidHighGraphicsDivet"
top_delta="0"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="HighGraphicsDivet"
top_delta="0"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="HighUltraGraphicsDivet"
top_delta="0"
width="2" />
<icon
color="DkGray"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
<slider
control_name="RenderQualityPerformance"
decimal_digits="0"
follows="left|top"
height="16"
increment="1"
initial_value="0"
layout="topleft"
left="150"
max_val="6"
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
width="275">
<slider.commit_callback
function="Pref.QualityPerformance"/>
</slider>
<text
type="string"
length="1"
@ -489,36 +298,6 @@
<check_box.commit_callback
function="Pref.RenderOptionUpdate" />
</check_box>
<slider
control_name="RenderFarClip"
decimal_digits="0"
follows="left|top"
height="16"
increment="8"
initial_value="160"
label="Draw distance:"
label_width="90"
layout="topleft"
left="30"
min_val="64"
max_val="512"
name="DrawDistance"
top_delta="40"
width="330" />
<text
type="string"
length="1"
follows="left|top"
height="12"
layout="topleft"
left_delta="330"
name="DrawDistanceMeterText2"
top_delta="0"
width="128">
m
</text>
<text
type="string"
length="1"
@ -780,56 +559,8 @@
<button.commit_callback
function="Pref.AutoAdjustments"/>
</button>
<slider
control_name="IndirectMaxComplexity"
tool_tip="Controls at what point a visually complex avatar is drawn as a JellyDoll"
follows="left|top"
height="16"
initial_value="101"
increment="1"
label="Avatar Maximum Complexity:"
label_width="165"
layout="topleft"
left="30"
min_val="1"
max_val="101"
name="IndirectMaxComplexity"
show_text="false"
top_delta="40"
width="300">
<slider.commit_callback
function="Pref.UpdateIndirectMaxComplexity"
parameter="IndirectMaxComlexityText" />
</slider>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
top_delta="0"
left_delta="304"
text_readonly_color="LabelDisabledColor"
name="IndirectMaxComplexityText"
width="65">
0
</text>
<text
type="string"
length="1"
follows="left|top"
height="16"
layout="topleft"
left_delta="68"
name="IndirectMaxComplexityLink"
mouse_opaque="false"
top_delta="0"
width="120">
[https://community.secondlife.com/t5/Featured-News/Why-are-all-these-people-made-of-colored-jelly/ba-p/3031255 What's this?]
</text>
<slider
<slider
control_name="RenderVolumeLODFactor"
tool_tip="Controls when lower-detail objects can be used to reduce rendering cost. Higher values cause lag, use with care."
follows="left|top"