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

merge changes for DRTVWR-257

meow-7.2.2
Nat Goodspeed 2012-12-05 18:18:16 -05:00
parent 8a019b961b c5aeb0667f
commit e1da5bda78
3 changed files with 41 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.hgtags
View File

@ -368,3 +368,4 @@ ab0aa2f6ba22b52fed30a2337197f589156edc75 DRTVWR-253
48382ec79741671d19ce4cc3e8cd59e9a521e4a7 DRTVWR-254
937ec902bb9a1cbceff17bd89e3923352b0a5fbc DRTVWR-256
44e764a6ac9e672a4f3bce821a4b6a218590c374 DRTVWR-258
c23d734065ed593b2413385aecd8366d8e0ee96b DRTVWR-257

4
indra/newview/llfeaturemanager.cpp
View File

@ -730,7 +730,9 @@ void LLFeatureManager::setGraphicsLevel(S32 level, bool skipFeatures)
maskFeatures("High");
maskFeatures("Class5");
break;
case 6:
maskFeatures("Ultra");
break;
default:
maskFeatures("Low");
maskFeatures("Class0");

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

@ -55,22 +55,31 @@
name="LowGraphicsDivet"
top_delta="-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
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="83"
left_pad="41"
name="MidGraphicsDivet"
top_delta="0"
width="2" />
<icon
<icon
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="85"
name="HighGraphicsDivet"
left_pad="41"
name="MidHighGraphicsDivet"
top_delta="0"
width="2" />
<icon
@ -78,7 +87,25 @@
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="83"
left_pad="41"
name="HighGraphicsDivet"
top_delta="0"
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
color="0.12 0.12 0.12 1"
height="14"
image_name="Rounded_Square"
layout="topleft"
left_pad="41"
name="UltraGraphicsDivet"
top_delta="0"
width="2" />
@ -91,7 +118,7 @@
initial_value="0"
layout="topleft"
left="120"
max_val="3"
max_val="6"
name="QualityPerformanceSelection"
show_text="false"
top_delta="-2"
@ -120,12 +147,12 @@
height="12"
layout="topleft"
left_delta="87"
name="ShadersPrefText2"
name="ShadersPrefText3"
top_delta="0"
width="80">
Mid
</text>
<text
<text
type="string"
length="1"
follows="left|top"
@ -136,8 +163,8 @@
name="ShadersPrefText3"
top_delta="0"
width="80">
High
</text>
High
</text>
<text
type="string"
length="1"