Skip to content
Snippets Groups Projects
Commit 73d1b4f7 authored by David Parks's avatar David Parks
Browse files

MAINT-1950 Add hashmarks to detail slider and put "Ultra" back in setGraphicsLevel

Reviewed by Simon
parent cca22d60
No related branches found
No related tags found
No related merge requests found
...@@ -720,7 +720,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures) ...@@ -720,7 +720,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures)
maskFeatures("High"); maskFeatures("High");
maskFeatures("Class5"); maskFeatures("Class5");
break; break;
case 6:
maskFeatures("Ultra");
break;
default: default:
maskFeatures("Low"); maskFeatures("Low");
maskFeatures("Class0"); maskFeatures("Class0");
......
...@@ -55,30 +55,57 @@ ...@@ -55,30 +55,57 @@
name="LowGraphicsDivet" name="LowGraphicsDivet"
top_delta="-2" top_delta="-2"
width="2" /> width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="LowMidraphicsDivet"
top_delta="-2"
width="2" />
<icon <icon
color="0.12 0.12 0.12 1" color="0.12 0.12 0.12 1"
height="14" height="14"
image_name="Rounded_Square" image_name="Rounded_Square"
layout="topleft" layout="topleft"
left_pad="83" left_pad="41"
name="MidGraphicsDivet" name="MidGraphicsDivet"
top_delta="0" top_delta="0"
width="2" /> width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="MidHighGraphicsDivet"
top_delta="0"
width="2" />
<icon <icon
color="0.12 0.12 0.12 1" color="0.12 0.12 0.12 1"
height="14" height="14"
image_name="Rounded_Square" image_name="Rounded_Square"
layout="topleft" layout="topleft"
left_pad="85" left_pad="41"
name="HighGraphicsDivet" name="HighGraphicsDivet"
top_delta="0" top_delta="0"
width="2" /> width="2" />
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="HighUltraGraphicsDivet"
top_delta="0"
width="2" />
<icon <icon
color="0.12 0.12 0.12 1" color="0.12 0.12 0.12 1"
height="14" height="14"
image_name="Rounded_Square" image_name="Rounded_Square"
layout="topleft" layout="topleft"
left_pad="83" left_pad="41"
name="UltraGraphicsDivet" name="UltraGraphicsDivet"
top_delta="0" top_delta="0"
width="2" /> width="2" />
...@@ -91,7 +118,7 @@ ...@@ -91,7 +118,7 @@
initial_value="0" initial_value="0"
layout="topleft" layout="topleft"
left="120" left="120"
max_val="3" max_val="6"
name="QualityPerformanceSelection" name="QualityPerformanceSelection"
show_text="false" show_text="false"
top_delta="-2" top_delta="-2"
...@@ -120,12 +147,12 @@ ...@@ -120,12 +147,12 @@
height="12" height="12"
layout="topleft" layout="topleft"
left_delta="87" left_delta="87"
name="ShadersPrefText2" name="ShadersPrefText3"
top_delta="0" top_delta="0"
width="80"> width="80">
Mid Mid
</text> </text>
<text <text
type="string" type="string"
length="1" length="1"
follows="left|top" follows="left|top"
...@@ -136,8 +163,8 @@ ...@@ -136,8 +163,8 @@
name="ShadersPrefText3" name="ShadersPrefText3"
top_delta="0" top_delta="0"
width="80"> width="80">
High High
</text> </text>
<text <text
type="string" type="string"
length="1" length="1"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment