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

Merge branch 'DRTVWR-539' of https://bitbucket.org/lindenlab/viewer 

# Conflicts:
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/skins/default/xui/en/floater_performance.xml
#	indra/newview/skins/default/xui/en/panel_performance_complexity.xml
#	indra/newview/skins/default/xui/en/panel_performance_huds.xml
#	indra/newview/skins/default/xui/en/panel_performance_preferences.xml
#	indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
master
Ansariel 2022-04-20 16:57:24 +02:00
parent d77e0c4e99 e5e710a1e6
commit cf1f221c9f
6 changed files with 32 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
indra/llcommon/tests/llprocess_test.cpp
View File

@ -356,7 +356,7 @@ namespace tut
// Create a script file in a temporary place.
NamedTempFile script("py",
"from __future__ import print_function" EOL
"from __future__ import print_function" EOL
"import sys" EOL
"import time" EOL
EOL
@ -366,7 +366,7 @@ namespace tut
"time.sleep(2)" EOL
"print('stderr after wait',file=sys.stderr)" EOL
"sys.stderr.flush()" EOL
);
);
// Arrange to track the history of our interaction with child: what we
// fetched, which pipe it came from, how many tries it took before we
@ -862,8 +862,8 @@ namespace tut
set_test_name("'bogus' test");
CaptureLog recorder;
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('Hello world')\n");
"from __future__ import print_function\n"
"print('Hello world')\n");
py.mParams.files.add(LLProcess::FileParam("bogus"));
py.mPy = LLProcess::create(py.mParams);
ensure("should have rejected 'bogus'", ! py.mPy);
@ -878,8 +878,8 @@ namespace tut
// Replace this test with one or more real 'file' tests when we
// implement 'file' support
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('Hello world')\n");
"from __future__ import print_function\n"
"print('Hello world')\n");
py.mParams.files.add(LLProcess::FileParam());
py.mParams.files.add(LLProcess::FileParam("file"));
py.mPy = LLProcess::create(py.mParams);
@ -894,8 +894,8 @@ namespace tut
// implement 'tpipe' support
CaptureLog recorder;
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('Hello world')\n");
"from __future__ import print_function\n"
"print('Hello world')\n");
py.mParams.files.add(LLProcess::FileParam());
py.mParams.files.add(LLProcess::FileParam("tpipe"));
py.mPy = LLProcess::create(py.mParams);
@ -912,8 +912,8 @@ namespace tut
// implement 'npipe' support
CaptureLog recorder;
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('Hello world')\n");
"from __future__ import print_function\n"
"print('Hello world')\n");
py.mParams.files.add(LLProcess::FileParam());
py.mParams.files.add(LLProcess::FileParam());
py.mParams.files.add(LLProcess::FileParam("npipe"));
@ -989,20 +989,20 @@ namespace tut
{
set_test_name("get*Pipe() validation");
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('this output is expected')\n");
"from __future__ import print_function\n"
"print('this output is expected')\n");
py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stdin
py.mParams.files.add(LLProcess::FileParam()); // inherit stdout
py.mParams.files.add(LLProcess::FileParam("pipe")); // pipe for stderr
py.run();
TEST_getPipe(*py.mPy, getWritePipe, getOptWritePipe,
LLProcess::STDIN, // VALID
LLProcess::STDOUT, // NOPIPE
LLProcess::STDERR); // BADPIPE
LLProcess::STDIN, // VALID
LLProcess::STDOUT, // NOPIPE
LLProcess::STDERR); // BADPIPE
TEST_getPipe(*py.mPy, getReadPipe, getOptReadPipe,
LLProcess::STDERR, // VALID
LLProcess::STDOUT, // NOPIPE
LLProcess::STDIN); // BADPIPE
LLProcess::STDERR, // VALID
LLProcess::STDOUT, // NOPIPE
LLProcess::STDIN); // BADPIPE
}
template<> template<>
@ -1129,8 +1129,8 @@ namespace tut
{
set_test_name("ReadPipe \"eof\" event");
PythonProcessLauncher py(get_test_name(),
"from __future__ import print_function\n"
"print('Hello from Python!')\n");
"from __future__ import print_function\n"
"print('Hello from Python!')\n");
py.mParams.files.add(LLProcess::FileParam()); // stdin
py.mParams.files.add(LLProcess::FileParam("pipe")); // stdout
py.launch();

1
indra/newview/llfloaterperformance.cpp
View File

@ -123,6 +123,7 @@ BOOL LLFloaterPerformance::postBuild()
mSettingsPanel->getChild<LLRadioGroup>("graphics_quality")->setCommitCallback(boost::bind(&LLFloaterPerformance::onChangeQuality, this, _2));
mSettingsPanel->getChild<LLCheckBoxCtrl>("advanced_lighting_model")->setMouseDownCallback(boost::bind(&LLFloaterPerformance::onClickAdvancedLighting, this));
mSettingsPanel->getChild<LLComboBox>("ShadowDetail")->setMouseDownCallback(boost::bind(&LLFloaterPerformance::onClickShadows, this));
mSettingsPanel->getChild<LLComboBox>("Reflections")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
mNearbyPanel->getChild<LLButton>("exceptions_btn")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickExceptions, this));
mNearbyPanel->getChild<LLCheckBoxCtrl>("hide_avatars")->setCommitCallback(boost::bind(&LLFloaterPerformance::onClickHideAvatars, this));

3
indra/newview/llfloaterpreferencesgraphicsadvanced.cpp
View File

@ -82,6 +82,9 @@ BOOL LLFloaterPreferenceGraphicsAdvanced::postBuild()
mComplexityChangedSignal = gSavedSettings.getControl("RenderAvatarMaxComplexity")->getCommitSignal()->connect(boost::bind(&LLFloaterPreferenceGraphicsAdvanced::updateComplexityText, this));
getChild<LLComboBox>("ShadowDetail")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
getChild<LLComboBox>("Reflections")->setMouseDownCallback(boost::bind(&LLFloaterPreference::showAutoAdjustWarning));
return TRUE;
}

8
indra/newview/llstartup.cpp
View File

@ -3040,7 +3040,13 @@ bool idle_startup()
if (STATE_CLEANUP == LLStartUp::getStartupState())
{
set_startup_status(1.0, "", "");
// <FS:Ansariel> Disable this in favor of FS performance floater customization
//if (gAgent.isFirstLogin())
//{
// gSavedSettings.setBOOL("AutoFPS", TRUE);
//}
// </FS:Ansariel>
set_startup_status(1.0, "", "");
display_startup();
if (!mBenefitsSuccessfullyInit)

4
indra/newview/skins/default/xui/en/floater_preferences_graphics_advanced.xml
View File

@ -698,8 +698,6 @@
top_delta="0"
name="Reflections"
width="150">
<combo_box.mouse_down_callback
function="Pref.AutoAdjustWarning" />
<combo_box.item
label="None; opaque"
name="-2"
@ -858,8 +856,6 @@
top_delta="0"
name="ShadowDetail"
width="150">
<combo_box.mouse_down_callback
function="Pref.AutoAdjustWarning" />
<combo_box.item
label="None"
name="0"

2
indra/newview/skins/default/xui/en/notifications.xml
View File

@ -1916,7 +1916,7 @@ Graphics Quality can be raised in Preferences &gt; Graphics.
icon="alertmodal.tga"
name="AutoFPSConfirmDisable"
type="alertmodal">
Changing this setting will disable automatic adjustment and turn off 'Auto FPS' setting.
Changing this setting will disable automatic adjustment and turn off 'Automatic settings'.
Are you sure you want to continue?
<tag>confirm</tag>
<usetemplate