Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions indra/newview/app_settings/settings_firestorm.xml
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,42 @@
<key>Value</key>
<integer>0</integer>
</map>

<key>AutoTuneRenderFarClipMin</key>
<map>
<key>Comment</key>
<string>The lowest draw distance that auto tune is allowed to use</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>32.0</real>
</map>

<key>AutoTuneRenderFarClipTarget</key>
<map>
<key>Comment</key>
<string>The draw distance that auto tune will try to achieve</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>256.0</real>
</map>

<key>AutoTuneImpostorFarAwayDistance</key>
<map>
<key>Comment</key>
<string>Avatars beyond this range will automatically be optimized</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>F32</string>
<key>Value</key>
<real>64.0</real>
</map>

<key>FSChatWindow</key>
<map>
Expand Down
7 changes: 5 additions & 2 deletions indra/newview/fsfloaterperformance.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -162,8 +162,11 @@ bool FSFloaterPerformance::postBuild()
mNearbyPanel->getChild<LLSliderCtrl>("RenderAvatarMaxART")->setCommitCallback(boost::bind(&FSFloaterPerformance::updateMaxRenderTime, this));

LLAvatarComplexityControls::setIndirectMaxArc();

// This seems counter intuitive, since what if a user wants to set this lower or higher than their currently set view distance,
// and also have it persist upon viewer startup? Commenting this out for now, so if it is desired it can be easily brought back.
// store the current setting as the users desired reflection detail and DD
if(!LLPerfStats::tunables.userAutoTuneEnabled)
/*if(!LLPerfStats::tunables.userAutoTuneEnabled)
{
if (gSavedDrawDistance)
{
Expand All @@ -173,7 +176,7 @@ bool FSFloaterPerformance::postBuild()
{
gSavedSettings.setF32("AutoTuneRenderFarClipTarget", LLPipeline::RenderFarClip);
}
}
}*/

return true;
}
Expand Down
4 changes: 4 additions & 0 deletions indra/newview/skins/default/xui/en/floater_fs_performance.xml
Original file line number Diff line number Diff line change
Expand Up @@ -297,6 +297,10 @@
label="Avatars and Scene"
name="av_and_scene"
value="1" />
<combo_box.item
label="Scene Only"
name="scene_only"
value="2" />
</combo_box>
<button
height="16"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ follows="top|left"
name="pref_dd_autotune"
left_pad="20"
min_val="32"
max_val="256"
max_val="1024"
width="140">
</spinner>
<text
Expand Down