merge changes for DRTVWR-257

2 files changed, 38 insertions, 9 deletions

diff --git a/indra/newview/llfeaturemanager.cpp b/indra/newview/llfeaturemanager.cpp
index 36bf5a6842..24a27c5146 100644
--- a/indra/newview/llfeaturemanager.cpp
+++ b/indra/newview/llfeaturemanager.cpp
@@ -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");
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
index f7666bdc4c..849f3ef73d 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
@@ -55,30 +55,57 @@
      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
+     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
      color="0.12 0.12 0.12 1"
      height="14"
      image_name="Rounded_Square"
      layout="topleft"
-     left_pad="85"
+     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="83"
+     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"