diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-02-05 12:30:34 -0500 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-02-05 12:30:34 -0500 |
| commit | 3279201c1bb9a624f749bd627848c346490f87d7 (patch) | |
| tree | b68e73675bf09bf560253f630bcb4f1e7b5360cd | |
| parent | d9eb8e27d57edc0857895fd0196f8f5a2c05130b (diff) | |
| parent | 702332fc02a57d099dd4fb7465e778a017d666da (diff) | |
merge changes for DRTVWR-296
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | doc/contributions.txt | 1 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml | 15 |
3 files changed, 16 insertions, 1 deletions
@@ -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 10d6818bd3..e86ef11a72 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 7eb0fac2be..cd243d40a4 100644 --- a/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml @@ -147,7 +147,7 @@ height="12" layout="topleft" left_delta="87" - name="ShadersPrefText3" + name="ShadersPrefText2" top_delta="0" width="80"> Mid @@ -159,6 +159,19 @@ halign="center" height="12" layout="topleft" + left_delta="87" + name="ShadersPrefText3" + top_delta="0" + width="80"> + High + </text> + <text + type="string" + length="1" + follows="left|top" + halign="center" + height="12" + layout="topleft" left_delta="85" name="ShadersPrefText4" top_delta="0" |