diff --git a/.hgtags b/.hgtags index 0f7e0e90dc82fe882b6190c7bf1f8bcb5bb9b966..fe21e711aff5413be1109f71223c5956ff7dfd25 100644 --- a/.hgtags +++ b/.hgtags @@ -413,3 +413,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 1567de5700c273b583dac41b64275c223287306e 3.4.5-beta4 +1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296 diff --git a/doc/contributions.txt b/doc/contributions.txt index 10d6818bd38a3ca23a8c6135ba4b0281272e65d6..e86ef11a72bd58e85621a2482f45d812f8afe0df 100644 --- a/doc/contributions.txt +++ b/doc/contributions.txt @@ -1251,6 +1251,7 @@ Whimsy Winx Whirly Fizzle STORM-1895 MAINT-873 + STORM-1930 Whoops Babii VWR-631 VWR-1640 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 7eb0fac2beb11dfe9bfaa6c976902821047c5983..cd243d40a4e653ddd8aa3fe035a755abb6f9ad56 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -147,11 +147,24 @@ height="12" layout="topleft" left_delta="87" - name="ShadersPrefText3" + name="ShadersPrefText2" top_delta="0" width="80"> Mid </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" + left_delta="87" + name="ShadersPrefText3" + top_delta="0" + width="80"> + High + </text> <text type="string" length="1"