Skip to content
Snippets Groups Projects
Commit 3279201c authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for DRTVWR-296

parents d9eb8e27 702332fc
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.hgtags
+ 1
− 0
View file @ 3279201c
...@@ -413,3 +413,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289 ...@@ -413,3 +413,4 @@ a676b4d6c037b39fe5b8e42cf8839a9303936089 DRTVWR-289
7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291 7f09bbc28c297f14b67961be7b6575445fa160e8 DRTVWR-291
b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292 b23419a2748483c98f3b84b630468a21c88feba5 DRTVWR-292
1567de5700c273b583dac41b64275c223287306e 3.4.5-beta4 1567de5700c273b583dac41b64275c223287306e 3.4.5-beta4
1cce8447f8f574673e3f47d6fe584262e6964fe2 DRTVWR-296
doc/contributions.txt
+ 1
− 0
View file @ 3279201c
...@@ -1251,6 +1251,7 @@ Whimsy Winx ...@@ -1251,6 +1251,7 @@ Whimsy Winx
Whirly Fizzle Whirly Fizzle
STORM-1895 STORM-1895
MAINT-873 MAINT-873
STORM-1930
Whoops Babii Whoops Babii
VWR-631 VWR-631
VWR-1640 VWR-1640
......
indra/newview/skins/default/xui/en/panel_preferences_graphics1.xml
+ 14
− 1
View file @ 3279201c
...@@ -147,11 +147,24 @@ ...@@ -147,11 +147,24 @@
height="12" height="12"
layout="topleft" layout="topleft"
left_delta="87" left_delta="87"
name="ShadersPrefText3" name="ShadersPrefText2"
top_delta="0" top_delta="0"
width="80"> width="80">
Mid Mid
</text> </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 <text
type="string" type="string"
length="1" length="1"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment